diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 2 |
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 |