Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11755
Change subject: gits: fix git_can_fast_forward: use arg instead of HEAD ...................................................................... gits: fix git_can_fast_forward: use arg instead of HEAD Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca --- M src/gits 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/55/11755/1 diff --git a/src/gits b/src/gits index 8b75278..490a6af 100755 --- a/src/gits +++ b/src/gits @@ -103,7 +103,7 @@ 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): -- To view, visit https://gerrit.osmocom.org/11755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca Gerrit-Change-Number: 11755 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>
