1#!/bin/sh 2# 3# Copyright (c) 2005 Junio C Hamano 4# 5# Resolve two or more trees. 6# 7 8LF=' 9' 10 11die () { 12echo>&2"$*" 13exit1 14} 15 16# The first parameters up to -- are merge bases; the rest are heads. 17bases=head= remotes= sep_seen= 18for arg 19do 20case",$sep_seen,$head,$arg,"in 21*,--,) 22 sep_seen=yes 23;; 24,yes,,*) 25head=$arg 26;; 27,yes,*) 28 remotes="$remotes$arg" 29;; 30*) 31 bases="$bases$arg" 32;; 33esac 34done 35 36# Reject if this is not an Octopus -- resolve should be used instead. 37case"$remotes"in 38?*' '?*) 39;; 40*) 41exit2;; 42esac 43 44# MRC is the current "merge reference commit" 45# MRT is the current "merge result tree" 46 47MRC=$(git rev-parse --verify -q $head) MSG= PARENT="-p$head" 48MRT=$(git write-tree) 49CNT=1;# counting our head 50NON_FF_MERGE=0 51OCTOPUS_FAILURE=0 52for SHA1 in$remotes 53do 54case"$OCTOPUS_FAILURE"in 551) 56# We allow only last one to have a hand-resolvable 57# conflicts. Last round failed and we still had 58# a head to merge. 59echo"Automated merge did not work." 60echo"Should not be doing an Octopus." 61exit2 62esac 63 64eval pretty_name=\${GITHEAD_$SHA1:-$SHA1} 65 common=$(git merge-base --all $SHA1 $MRC)|| 66 die "Unable to find common commit with$pretty_name" 67 68case"$LF$common$LF"in 69*"$LF$SHA1$LF"*) 70echo"Already up-to-date with$pretty_name" 71continue 72;; 73esac 74 75 CNT=`expr$CNT+ 1` 76 PARENT="$PARENT-p$SHA1" 77 78iftest"$common,$NON_FF_MERGE"="$MRC,0" 79then 80# The first head being merged was a fast-forward. 81# Advance MRC to the head being merged, and use that 82# tree as the intermediate result of the merge. 83# We still need to count this as part of the parent set. 84 85echo"Fast-forwarding to:$pretty_name" 86 git read-tree -u -m$head $SHA1||exit 87 MRC=$SHA1 MRT=$(git write-tree) 88continue 89fi 90 91 NON_FF_MERGE=1 92 93echo"Trying simple merge with$pretty_name" 94 git read-tree -u -m --aggressive$common $MRT $SHA1||exit2 95 next=$(git write-tree 2>/dev/null) 96iftest $? -ne0 97then 98echo"Simple merge did not work, trying automatic merge." 99 git-merge-index -o git-merge-one-file -a|| 100 OCTOPUS_FAILURE=1 101 next=$(git write-tree 2>/dev/null) 102fi 103 104 MRC="$MRC$SHA1" 105 MRT=$next 106done 107 108exit"$OCTOPUS_FAILURE"