osmocom
/
osmo-dev
mirror of https://gerrit.osmocom.org/osmo-dev
11
0
Fork 0
Code Releases Activity

gits: fix git_can_fast_forward: use arg instead of HEAD 

Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca
This commit is contained in:
Neels Hofmeyr 2018-11-12 22:44:59 +01:00 committed by Neels Hofmeyr
parent 2a30b520c4
commit 39b19b687c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gits
View File

@ -103,7 +103,7 @@ def git_has_modifications(git_dir):
def git_can_fast_forward(git_dir, branch='master', remote='origin'):
return git_bool(git_dir, 'merge-base', '--is-ancestor', 'HEAD', remote + '/' + branch)
return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, remote + '/' + branch)
def format_branch_ahead_behind(branch, ahead, behind):