Change in osmo-dev[master]: gits: fix git_can_fast_forward: use arg instead of HEAD

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Mon Nov 19 15:45:20 UTC 2018


Neels Hofmeyr has submitted this change and it was merged. ( 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(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved; Verified
  osmith: Looks good to me, but someone else must approve



diff --git a/src/gits b/src/gits
index bd53cb5..cb2cf59 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: merged
Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca
Gerrit-Change-Number: 11755
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181119/28816ded/attachment.htm>


More information about the gerrit-log mailing list