diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-04-05 14:51:18 +0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2012-11-07 20:57:33 +0100 |
| commit | dfbedfe0fb63839c9119109c29cdae8cd6749ba1 (patch) | |
| tree | 4ea33cd65d08ecf42bfe05c1de66dcbb4aff4893 /gbp/git | |
| parent | f4d2e21f475a7f6f9039f7b7ce223b9179f9cfbe (diff) | |
GitRepository: fix merge() for older git versions
Utilize _cmd_has_feature() in GitRepository.merge() to not give
edit/no-edit option for older versions of git-merge, that don't support
it. Fixes a regression (with git-version < 1.7.8) caused by commit
f3aa87fa0361a.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/git')
| -rw-r--r-- | gbp/git/repository.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index e31584c..9d81399 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -372,7 +372,11 @@ class GitRepository(object): """ args = GitArgs() args.add_cond(verbose, '--summary', '--no-summary') - args.add_cond(edit, '--edit', '--no-edit') + if (self._cmd_has_feature('merge', 'edit')): + args.add_cond(edit, '--edit', '--no-edit') + else: + log.debug("Your git suite doesn't support --edit/--no-edit " + "option for git-merge ") args.add(commit) self._git_command("merge", args.args) |