diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index eb3f473d5a..645e1147dc 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -45,7 +45,7 @@ esac # MRT is the current "merge result tree" MRC=$head MSG= PARENT="-p $head" -MRT=$(git-write-tree) +MRT=$(git write-tree) CNT=1 ;# counting our head NON_FF_MERGE=0 OCTOPUS_FAILURE=0 @@ -61,7 +61,7 @@ do exit 2 esac - common=$(git-merge-base --all $MRC $SHA1) || + common=$(git merge-base --all $MRC $SHA1) || die "Unable to find common commit with $SHA1" case "$LF$common$LF" in @@ -82,22 +82,22 @@ do # We still need to count this as part of the parent set. echo "Fast forwarding to: $SHA1" - git-read-tree -u -m $head $SHA1 || exit - MRC=$SHA1 MRT=$(git-write-tree) + git read-tree -u -m $head $SHA1 || exit + MRC=$SHA1 MRT=$(git write-tree) continue fi NON_FF_MERGE=1 echo "Trying simple merge with $SHA1" - git-read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 - next=$(git-write-tree 2>/dev/null) + git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 + next=$(git write-tree 2>/dev/null) if test $? -ne 0 then echo "Simple merge did not work, trying automatic merge." git-merge-index -o git-merge-one-file -a || OCTOPUS_FAILURE=1 - next=$(git-write-tree 2>/dev/null) + next=$(git write-tree 2>/dev/null) fi # We have merged the other branch successfully. Ideally |