]>
git.ipfire.org Git - thirdparty/git.git/blob - git-merge-octopus.sh
3 # Copyright (c) 2005 Junio C Hamano
5 # Resolve two or more trees.
16 # The first parameters up to -- are merge bases; the rest are heads.
17 bases
= head= remotes
= sep_seen
=
20 case ",$sep_seen,$head,$arg," in
28 remotes
="$remotes$arg "
36 # Reject if this is not an Octopus -- resolve should be used instead.
44 # MRC is the current "merge reference commit"
45 # MRT is the current "merge result tree"
47 MRC
=$head MSG
= PARENT
="-p $head"
49 CNT
=1 ;# counting our head
53 common
=$
(git-merge-base
--all $MRC $SHA1) ||
54 die
"Unable to find common commit with $SHA1"
58 die
"Not trivially mergeable."
61 echo "Already up-to-date with $SHA1"
67 PARENT
="$PARENT -p $SHA1"
69 if test "$common,$NON_FF_MERGE" = "$MRC,0"
71 # The first head being merged was a fast-forward.
72 # Advance MRC to the head being merged, and use that
73 # tree as the intermediate result of the merge.
74 # We still need to count this as part of the parent set.
76 echo "Fast forwarding to: $SHA1"
77 git-read-tree
-u -m $head $SHA1 ||
exit
78 MRC
=$SHA1 MRT
=$
(git-write-tree
)
84 echo "Trying simple merge with $SHA1"
85 git-read-tree
-u -m $common $MRT $SHA1 ||
exit 2
86 next
=$
(git-write-tree
2>/dev
/null
)
89 echo "Simple merge did not work, trying automatic merge."
90 git-merge-index
-o git-merge-one-file
-a ||
91 exit 2 ; # Automatic merge failed; should not be doing Octopus
92 next
=$
(git-write-tree
2>/dev
/null
)
95 # We have merged the other branch successfully. Ideally
96 # we could implement OR'ed heads in merge-base, and keep
97 # a list of commits we have merged so far in MRC to feed
98 # them to merge-base, but we approximate it by keep using
99 # the current MRC. We used to update it to $common, which
100 # was incorrectly doing AND'ed merge-base here, which was