summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-12-11 16:38:58 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-13 23:40:24 -0800
commit85bf49f9a55fd9ded396460d245a55b651d7bdaa (patch)
treef7927bdd30d780307a963ddf63a71f5543ebe09e /git-merge-octopus.sh
parent81334502eed1c78f49fc74936b712b3cf32b682a (diff)
downloadgit-85bf49f9a55fd9ded396460d245a55b651d7bdaa.tar.gz
octopus: reenable fast-forward merges
The fast-forward logic is never being triggered because $common and $MRC are never equivalent. $common is initialized to a commit id by merge-base and MRC is initialized to HEAD. Fix this by initializing $MRC to the commit id for HEAD so that its possible for $MRC and $common to be equal. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
-rwxr-xr-xgit-merge-octopus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 3bb1acd527..3d1a29ecd2 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -44,7 +44,7 @@ esac
# MRC is the current "merge reference commit"
# MRT is the current "merge result tree"
-MRC=$head MSG= PARENT="-p $head"
+MRC=$(git rev-parse --verify -q $head) MSG= PARENT="-p $head"
MRT=$(git write-tree)
CNT=1 ;# counting our head
NON_FF_MERGE=0