diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 3bb1acd527b2fb58986fa49823ff1fe2dde4c61a..3d1a29ecd2079decc0602b0073c32dd4a6c7ac0e 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
# 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