unexpected Make output (e.g. from --debug) causes build failure

[git.git] / git-merge-octopus.sh

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index eb74f96e81b4980f395944da46602e29555fc6db..645e1147dc886f2b1ca6d2020b44db746b082bf0 100755 (executable)
--- 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 $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