diff options
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 7adffdc795..eb74f96e81 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -48,16 +48,24 @@ MRC=$head MSG= PARENT="-p $head" MRT=$(git-write-tree) CNT=1 ;# counting our head NON_FF_MERGE=0 +OCTOPUS_FAILURE=0 for SHA1 in $remotes do + case "$OCTOPUS_FAILURE" in + 1) + # We allow only last one to have a hand-resolvable + # conflicts. Last round failed and we still had + # a head to merge. + echo "Automated merge did not work." + echo "Should not be doing an Octopus." + exit 2 + esac + common=$(git-merge-base --all $MRC $SHA1) || die "Unable to find common commit with $SHA1" - case "$common" in - ?*"$LF"?*) - die "Not trivially mergeable." - ;; - $SHA1) + case "$LF$common$LF" in + *"$LF$SHA1$LF"*) echo "Already up-to-date with $SHA1" continue ;; @@ -88,7 +96,7 @@ do then echo "Simple merge did not work, trying automatic merge." git-merge-index -o git-merge-one-file -a || - exit 2 ; # Automatic merge failed; should not be doing Octopus + OCTOPUS_FAILURE=1 next=$(git-write-tree 2>/dev/null) fi @@ -103,4 +111,4 @@ do MRT=$next done -exit 0 +exit "$OCTOPUS_FAILURE" |