Google Git
Sign in
googlers / jrn / git / 6f42f89c1f7030d1101f08bf56d06cc2b6828b83 / . / git-merge.sh
blob: a221daa7f4882892b29b19b156dfc31986fc8912 [file] [log] [blame]
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]1#!/bin/sh
2#
3# Copyright (c) 2005 Junio C Hamano
4#
5
Junio C Hamanoae2b0f12005-11-24 00:12:11 -0800[diff] [blame]6. git-sh-setup
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]7
8LF='
9'
10
11usage () {
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]12 die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]13}
14
Junio C Hamano64da9e62005-11-01 19:34:49 -0800[diff] [blame]15all_strategies='recursive octopus resolve stupid ours'
Junio C Hamanofbf8ac22005-11-23 16:23:11 -0800[diff] [blame]16default_strategies='recursive'
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]17use_strategies=
18
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]19dropsave() {
Junio C Hamanodeca7e82005-09-25 00:12:06 -0700[diff] [blame]20 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]21 "$GIT_DIR/MERGE_SAVE" || exit 1
22}
23
24savestate() {
Junio C Hamano60fa0562005-09-28 16:29:11 -0700[diff] [blame]25 # Stash away any local modifications.
Chris Shoemaker50b8e352005-10-28 13:04:49 -0400[diff] [blame]26 git-diff-index -z --name-only $head |
Fredrik Kuivinen88f8f0a2005-10-03 08:13:09 +0200[diff] [blame]27 cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]28}
29
30restorestate() {
Junio C Hamanodeca7e82005-09-25 00:12:06 -0700[diff] [blame]31 if test -f "$GIT_DIR/MERGE_SAVE"
32 then
33 git reset --hard $head
34 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
35 git-update-index --refresh >/dev/null
36 fi
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]37}
38
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]39finish () {
40 test '' = "$2" || echo "$2"
41 case "$merge_msg" in
42 '')
43 echo "No merge message -- not updating HEAD"
44 ;;
45 *)
46 git-update-ref HEAD "$1" "$head" || exit 1
47 ;;
48 esac
49
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]50 case "$no_summary" in
51 '')
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]52 git-diff-tree -p -M "$head" "$1" |
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]53 git-apply --stat --summary
54 ;;
55 esac
56}
57
58while case "$#" in 0) break ;; esac
59do
60 case "$1" in
61 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
62 --no-summa|--no-summar|--no-summary)
63 no_summary=t ;;
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]64 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
65 no_commit=t ;;
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]66 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
67 --strateg=*|--strategy=*|\
68 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
69 case "$#,$1" in
70 *,*=*)
71 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
Junio C Hamanof88ed172005-09-12 22:20:42 -0700[diff] [blame]72 1,*)
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]73 usage ;;
74 *)
75 strategy="$2"
76 shift ;;
77 esac
78 case " $all_strategies " in
79 *" $strategy "*)
80 use_strategies="$use_strategies$strategy " ;;
81 *)
82 die "available strategies are: $all_strategies" ;;
83 esac
84 ;;
85 -*) usage ;;
86 *) break ;;
87 esac
88 shift
89done
90
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]91test "$#" -le 2 && usage ;# we need at least two heads.
92
93merge_msg="$1"
94shift
Fredrik Kuivinen8cc01e52005-09-25 16:49:02 +0200[diff] [blame]95head_arg="$1"
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]96head=$(git-rev-parse --verify "$1"^0) || usage
97shift
98
99# All the rest are remote heads
100for remote
101do
102 git-rev-parse --verify "$remote"^0 >/dev/null ||
103 die "$remote - not something we can merge"
104done
105
Junio C Hamano13956672005-11-09 18:54:14 -0800[diff] [blame]106case "$#" in
1071)
108 common=$(git-merge-base --all $head "$@")
109 ;;
110*)
111 common=$(git-show-branch --merge-base $head "$@")
112 ;;
113esac
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]114echo "$head" >"$GIT_DIR/ORIG_HEAD"
115
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]116case "$#,$common,$no_commit" in
117*,'',*)
Fredrik Kuivinen88f8f0a2005-10-03 08:13:09 +0200[diff] [blame]118 # No common ancestors found. We need a real merge.
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]119 ;;
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]1201,"$1",*)
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]121 # If head can reach all the merge then we are up to date.
122 # but first the most common case of merging one remote
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]123 echo "Already up-to-date."
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]124 dropsave
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]125 exit 0
126 ;;
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]1271,"$head",*)
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]128 # Again the most common case of merging one remote.
129 echo "Updating from $head to $1."
130 git-update-index --refresh 2>/dev/null
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700[diff] [blame]131 new_head=$(git-rev-parse --verify "$1^0") &&
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]132 git-read-tree -u -m $head "$new_head" &&
133 finish "$new_head" "Fast forward"
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]134 dropsave
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]135 exit 0
136 ;;
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]1371,?*"$LF"?*,*)
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]138 # We are not doing octopus and not fast forward. Need a
139 # real merge.
140 ;;
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]1411,*,)
Junio C Hamanof9d72412005-10-02 11:13:44 -0700[diff] [blame]142 # We are not doing octopus, not fast forward, and have only
143 # one common. See if it is really trivial.
144 echo "Trying really trivial in-index merge..."
145 git-update-index --refresh 2>/dev/null
146 if git-read-tree --trivial -m -u $common $head "$1" &&
147 result_tree=$(git-write-tree)
148 then
149 echo "Wonderful."
150 result_commit=$(
151 echo "$merge_msg" |
152 git-commit-tree $result_tree -p HEAD -p "$1"
153 ) || exit
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]154 finish "$result_commit" "In-index merge"
Junio C Hamanof9d72412005-10-02 11:13:44 -0700[diff] [blame]155 dropsave
156 exit 0
157 fi
158 echo "Nope."
159 ;;
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]160*)
161 # An octopus. If we can reach all the remote we are up to date.
162 up_to_date=t
163 for remote
164 do
Junio C Hamano13956672005-11-09 18:54:14 -0800[diff] [blame]165 common_one=$(git-merge-base --all $head $remote)
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]166 if test "$common_one" != "$remote"
167 then
168 up_to_date=f
169 break
170 fi
171 done
172 if test "$up_to_date" = t
173 then
174 echo "Already up-to-date. Yeeah!"
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]175 dropsave
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]176 exit 0
177 fi
178 ;;
179esac
180
Junio C Hamanofbf8ac22005-11-23 16:23:11 -0800[diff] [blame]181case "$use_strategies" in
182'')
183 case "$#" in
184 1)
185 use_strategies="$default_strategies" ;;
186 *)
187 use_strategies=octopus ;;
188 esac
189 ;;
190esac
191
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]192# At this point, we need a real merge. No matter what strategy
193# we use, it would operate on the index, possibly affecting the
194# working tree, and when resolved cleanly, have the desired tree
195# in the index -- this means that the index must be in sync with
Junio C Hamano60fa0562005-09-28 16:29:11 -0700[diff] [blame]196# the $head commit. The strategies are responsible to ensure this.
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]197
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]198case "$use_strategies" in
199?*' '?*)
200 # Stash away the local changes so that we can try more than one.
201 savestate
202 single_strategy=no
203 ;;
204*)
Junio C Hamanodeca7e82005-09-25 00:12:06 -0700[diff] [blame]205 rm -f "$GIT_DIR/MERGE_SAVE"
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]206 single_strategy=yes
207 ;;
208esac
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]209
210result_tree= best_cnt=-1 best_strategy= wt_strategy=
211for strategy in $use_strategies
212do
213 test "$wt_strategy" = '' || {
214 echo "Rewinding the tree to pristine..."
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]215 restorestate
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]216 }
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]217 case "$single_strategy" in
218 no)
219 echo "Trying merge strategy $strategy..."
220 ;;
221 esac
222
223 # Remember which strategy left the state in the working tree
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]224 wt_strategy=$strategy
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]225
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]226 git-merge-$strategy $common -- "$head_arg" "$@"
227 exit=$?
228 if test "$no_commit" = t && test "$exit" = 0
229 then
230 exit=1 ;# pretend it left conflicts.
231 fi
232
233 test "$exit" = 0 || {
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]234
235 # The backend exits with 1 when conflicts are left to be resolved,
236 # with 2 when it does not handle the given merge at all.
237
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]238 if test "$exit" -eq 1
239 then
240 cnt=`{
241 git-diff-files --name-only
242 git-ls-files --unmerged
243 } | wc -l`
244 if test $best_cnt -le 0 -o $cnt -le $best_cnt
245 then
246 best_strategy=$strategy
247 best_cnt=$cnt
248 fi
249 fi
250 continue
251 }
252
253 # Automerge succeeded.
254 result_tree=$(git-write-tree) && break
255done
256
257# If we have a resulting tree, that means the strategy module
258# auto resolved the merge cleanly.
259if test '' != "$result_tree"
260then
261 parents="-p $head"
262 for remote
263 do
264 parents="$parents -p $remote"
265 done
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700[diff] [blame]266 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
Junio C Hamano4f692b12005-10-22 04:45:15 -0700[diff] [blame]267 finish "$result_commit" "Merge $result_commit, made by $wt_strategy."
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]268 dropsave
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]269 exit 0
270fi
271
272# Pick the result from the best strategy and have the user fix it up.
273case "$best_strategy" in
274'')
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]275 restorestate
Fredrik Kuivinen4275df52005-12-03 11:40:21 +0100[diff] [blame]276 echo >&2 "No merge strategy handled the merge."
277 exit 2
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]278 ;;
279"$wt_strategy")
280 # We already have its result in the working tree.
281 ;;
282*)
283 echo "Rewinding the tree to pristine..."
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]284 restorestate
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]285 echo "Using the $best_strategy to prepare resolving by hand."
Junio C Hamanoa9358242005-09-23 00:43:04 -0700[diff] [blame]286 git-merge-$best_strategy $common -- "$head_arg" "$@"
Junio C Hamano91063bb2005-09-08 13:47:12 -0700[diff] [blame]287 ;;
288esac
289for remote
290do
291 echo $remote
292done >"$GIT_DIR/MERGE_HEAD"
Junio C Hamanodeca7e82005-09-25 00:12:06 -0700[diff] [blame]293echo $merge_msg >"$GIT_DIR/MERGE_MSG"
294
Junio C Hamano123ee3c2005-11-01 19:30:11 -0800[diff] [blame]295die "Automatic merge failed/prevented; fix up by hand"