undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octopus: allow manual resolve on the last round.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-01-13 16:45:42 -08:00
parent 9e9b26751a
commit 98efc8f3d8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-merge-octopus.sh
View File

@ -48,8 +48,19 @@ MRC=$head MSG= PARENT="-p $head"
MRT=$(git-write-tree) MRT=$(git-write-tree)
CNT=1 ;# counting our head CNT=1 ;# counting our head
NON_FF_MERGE=0 NON_FF_MERGE=0
OCTOPUS_FAILURE=0
for SHA1 in $remotes for SHA1 in $remotes
do 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) || common=$(git-merge-base --all $MRC $SHA1) ||
die "Unable to find common commit with $SHA1" die "Unable to find common commit with $SHA1"
@ -84,11 +95,8 @@ do
if test $? -ne 0 if test $? -ne 0
then then
echo "Simple merge did not work, trying automatic merge." echo "Simple merge did not work, trying automatic merge."
git-merge-index -o git-merge-one-file -a || { git-merge-index -o git-merge-one-file -a ||
echo "Not trivially merged." OCTOPUS_FAILURE=1
echo "Should not be doing an Octopus."
exit 2
}
next=$(git-write-tree 2>/dev/null) next=$(git-write-tree 2>/dev/null)
fi fi
@ -103,4 +111,4 @@ do
MRT=$next MRT=$next
done done
exit 0 exit "$OCTOPUS_FAILURE"