diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2008-06-25 18:17:57 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2008-06-25 18:17:57 -0400 |
| commit | f899c06bfaebe4d21aa5f479e0a72e7b86c875d4 (patch) | |
| tree | 663858de820b3f2f1cf66d60d73ce3dedfdaf985 | |
| parent | 82c8ab3bf3bec8e3a5d2baefe2f43c654b3483b9 (diff) | |
Minor fixes to everest-sync
* Handle the case where the user types no arguments
* Properly 'checkout -b'
| -rw-r--r-- | everest-sync/bin/everest-sync | 11 | ||||
| -rw-r--r-- | everest-sync/extra/everest-sync.spec | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/everest-sync/bin/everest-sync b/everest-sync/bin/everest-sync index 1752c09..6c1b56d 100644 --- a/everest-sync/bin/everest-sync +++ b/everest-sync/bin/everest-sync @@ -29,6 +29,12 @@ Main { option('verbose', 'v') + def run + require 'rbconfig' + script = File.join(Config::CONFIG['bindir'], @@app_name) + exec("#{script} --help") + end + mode('clean') { def run() verbose("Removing #{@@working_dir}") @@ -166,11 +172,6 @@ Main { # I couldn't find a way to 'checkout -b --force' so this will have to do for # now. It would be better to work this into the git gem at some point. def checkout_b(git, branch, opts = {}) - if stale_branch = git.branches.local.find {|b| b.name == branch.name} - verbose("Removing stale branch #{stale_branch}") - stale_branch.delete - end if opts[:force] - verbose("Setting #{branch.name} to #{git.object(branch).sha}") git.branch(branch.name).checkout git.reset_hard(branch) diff --git a/everest-sync/extra/everest-sync.spec b/everest-sync/extra/everest-sync.spec index d127243..6cb9a0c 100644 --- a/everest-sync/extra/everest-sync.spec +++ b/everest-sync/extra/everest-sync.spec @@ -6,7 +6,7 @@ Summary: A tool for syncronizing Everest Repositories Name: rubygem-%{gemname} Version: 1.0.0 -Release: 2%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 URL: https://fedorahosting.org/everest |