diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-11 16:38:03 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-11 16:40:41 -0400 |
| commit | d002180240a39a8c383907189d0a75fa888cdab9 (patch) | |
| tree | 0e770b924db53ee7c2e77d9e3a8d8e343a71ba48 | |
| parent | 3180d9d731889e88ad17615cf1078652d25c5c05 (diff) | |
Fixing some genome-sync bugs related to superprojects
* the superproject's .git dir was getting picked up
* superprojects checkout (no branch) by default, we don't want that
| -rw-r--r-- | genome-sync/bin/genome-sync | 4 | ||||
| -rw-r--r-- | genome-sync/extra/genome-sync.spec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/genome-sync/bin/genome-sync b/genome-sync/bin/genome-sync index c65ae6e..3c16e5b 100644 --- a/genome-sync/bin/genome-sync +++ b/genome-sync/bin/genome-sync @@ -152,6 +152,7 @@ Main { verbose("Pushing all branches in #{d} to #{dest}:") git = Git.open(d) git.branches.local.each do |b| + next if b.name == "(no branch)" #important for superprojects b.checkout verbose("#{b}") git.push(dest,b, :force => true) @@ -178,7 +179,8 @@ Main { end def working_git_dirs - Dir[workingdir + "/**/.git"].map {|g| File.dirname(g)} + # The single * is important. Else superproject could get picked up + Dir[workingdir + "/*/.git"].map {|g| File.dirname(g)} end # Just a helper method. Handle recovery diff --git a/genome-sync/extra/genome-sync.spec b/genome-sync/extra/genome-sync.spec index a3eeb76..fa68451 100644 --- a/genome-sync/extra/genome-sync.spec +++ b/genome-sync/extra/genome-sync.spec @@ -6,7 +6,7 @@ Summary: A tool for syncronizing Genome Repositories Name: rubygem-%{gemname} Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Group: Development/Languages License: GPLv2 URL: https://fedorahosting.org/genome |