gitk: Second try to work around the command line limit on Windows
[git/dscho.git] / git-merge-octopus.sh
blob615753c83c38f4a97752d5ca3400beeef4acd5f1
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
5 # Resolve two or more trees.
8 LF='
11 die () {
12 echo >&2 "$*"
13 exit 1
16 # The first parameters up to -- are merge bases; the rest are heads.
17 bases= head= remotes= sep_seen=
18 for arg
20 case ",$sep_seen,$head,$arg," in
21 *,--,)
22 sep_seen=yes
24 ,yes,,*)
25 head=$arg
27 ,yes,*)
28 remotes="$remotes$arg "
31 bases="$bases$arg "
33 esac
34 done
36 # Reject if this is not an Octopus -- resolve should be used instead.
37 case "$remotes" in
38 ?*' '?*)
41 exit 2 ;;
42 esac
44 # MRC is the current "merge reference commit"
45 # MRT is the current "merge result tree"
47 MRC=$(git rev-parse --verify -q $head)
48 MRT=$(git write-tree)
49 NON_FF_MERGE=0
50 OCTOPUS_FAILURE=0
51 for SHA1 in $remotes
53 case "$OCTOPUS_FAILURE" in
55 # We allow only last one to have a hand-resolvable
56 # conflicts. Last round failed and we still had
57 # a head to merge.
58 echo "Automated merge did not work."
59 echo "Should not be doing an Octopus."
60 exit 2
61 esac
63 eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
64 common=$(git merge-base --all $SHA1 $MRC) ||
65 die "Unable to find common commit with $pretty_name"
67 case "$LF$common$LF" in
68 *"$LF$SHA1$LF"*)
69 echo "Already up-to-date with $pretty_name"
70 continue
72 esac
74 if test "$common,$NON_FF_MERGE" = "$MRC,0"
75 then
76 # The first head being merged was a fast-forward.
77 # Advance MRC to the head being merged, and use that
78 # tree as the intermediate result of the merge.
79 # We still need to count this as part of the parent set.
81 echo "Fast-forwarding to: $pretty_name"
82 git read-tree -u -m $head $SHA1 || exit
83 MRC=$SHA1 MRT=$(git write-tree)
84 continue
87 NON_FF_MERGE=1
89 echo "Trying simple merge with $pretty_name"
90 git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
91 next=$(git write-tree 2>/dev/null)
92 if test $? -ne 0
93 then
94 echo "Simple merge did not work, trying automatic merge."
95 git-merge-index -o git-merge-one-file -a ||
96 OCTOPUS_FAILURE=1
97 next=$(git write-tree 2>/dev/null)
100 MRC="$MRC $SHA1"
101 MRT=$next
102 done
104 exit "$OCTOPUS_FAILURE"