aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-03-03 08:10:16 +0100
committerGuido Günther <agx@sigxcpu.org>2011-03-03 08:11:21 +0100
commit258743a8f767a75d6fdf10dcf0f0e23edb104493 (patch)
tree789e5d911bab48c6a732cef88e13a0ab841c52c5 /gbp
parent3b0f2965073c07a10b32922405c3a67e00677902 (diff)
is_fast_forward: make sure git interprets arguments as revisions
so git prints a clearer error message on configuration errors in .git/config
Diffstat (limited to 'gbp')
-rw-r--r--gbp/git.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gbp/git.py b/gbp/git.py
index 1ecab9f1..cf85f0a0 100644
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -175,7 +175,8 @@ class GitRepository(object):
has_local = False # local repo has new commits
has_remote = False # remote repo has new commits
out = self.__git_getoutput('rev-list', ["--left-right",
- "%s...%s" % (from_branch, to_branch)])[0]
+ "%s...%s" % (from_branch, to_branch),
+ "--"])[0]
if not out: # both branches have the same commits
return True, True