]>
Commit | Line | Data |
---|---|---|
91063bbc JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano | |
4 | # | |
5 | ||
f9474132 | 6 | USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+' |
17bcdad3 | 7 | |
533b7039 | 8 | SUBDIRECTORY_OK=Yes |
ae2b0f15 | 9 | . git-sh-setup |
7eff28a9 | 10 | require_work_tree |
533b7039 | 11 | cd_to_toplevel |
91063bbc | 12 | |
d1014a17 | 13 | test -z "$(git ls-files -u)" || |
533b7039 | 14 | die "You are in the middle of a conflicted merge." |
d1014a17 | 15 | |
91063bbc JH |
16 | LF=' |
17 | ' | |
18 | ||
68faf689 | 19 | all_strategies='recur recursive octopus resolve stupid ours subtree' |
a06f678e | 20 | default_twohead_strategies='recursive' |
6ea23343 | 21 | default_octopus_strategies='octopus' |
68faf689 | 22 | no_trivial_merge_strategies='ours subtree' |
91063bbc | 23 | use_strategies= |
6ea23343 JH |
24 | |
25 | index_merge=t | |
91063bbc | 26 | |
a9358240 | 27 | dropsave() { |
deca7e8c | 28 | rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \ |
a9358240 JH |
29 | "$GIT_DIR/MERGE_SAVE" || exit 1 |
30 | } | |
31 | ||
32 | savestate() { | |
60fa0560 | 33 | # Stash away any local modifications. |
50b8e355 | 34 | git-diff-index -z --name-only $head | |
88f8f0a5 | 35 | cpio -0 -o >"$GIT_DIR/MERGE_SAVE" |
a9358240 JH |
36 | } |
37 | ||
38 | restorestate() { | |
deca7e8c JH |
39 | if test -f "$GIT_DIR/MERGE_SAVE" |
40 | then | |
228e2eb6 | 41 | git reset --hard $head >/dev/null |
deca7e8c JH |
42 | cpio -iuv <"$GIT_DIR/MERGE_SAVE" |
43 | git-update-index --refresh >/dev/null | |
44 | fi | |
91063bbc JH |
45 | } |
46 | ||
7d0c6887 JH |
47 | finish_up_to_date () { |
48 | case "$squash" in | |
49 | t) | |
50 | echo "$1 (nothing to squash)" ;; | |
51 | '') | |
52 | echo "$1" ;; | |
53 | esac | |
54 | dropsave | |
55 | } | |
56 | ||
57 | squash_message () { | |
58 | echo Squashed commit of the following: | |
59 | echo | |
60 | git-log --no-merges ^"$head" $remote | |
61 | } | |
62 | ||
4f692b19 | 63 | finish () { |
e1447e38 SP |
64 | if test '' = "$2" |
65 | then | |
f9474132 | 66 | rlogm="$GIT_REFLOG_ACTION" |
e1447e38 SP |
67 | else |
68 | echo "$2" | |
f9474132 | 69 | rlogm="$GIT_REFLOG_ACTION: $2" |
e1447e38 | 70 | fi |
7d0c6887 JH |
71 | case "$squash" in |
72 | t) | |
73 | echo "Squash commit -- not updating HEAD" | |
74 | squash_message >"$GIT_DIR/SQUASH_MSG" | |
4f692b19 | 75 | ;; |
7d0c6887 JH |
76 | '') |
77 | case "$merge_msg" in | |
78 | '') | |
79 | echo "No merge message -- not updating HEAD" | |
80 | ;; | |
81 | *) | |
e1447e38 | 82 | git-update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1 |
7d0c6887 JH |
83 | ;; |
84 | esac | |
4f692b19 JH |
85 | ;; |
86 | esac | |
7d0c6887 | 87 | case "$1" in |
91063bbc | 88 | '') |
7d0c6887 JH |
89 | ;; |
90 | ?*) | |
91 | case "$no_summary" in | |
92 | '') | |
fefe49d1 JB |
93 | # We want color (if set), but no pager |
94 | GIT_PAGER='' git-diff --stat --summary -M "$head" "$1" | |
7d0c6887 JH |
95 | ;; |
96 | esac | |
91063bbc JH |
97 | ;; |
98 | esac | |
99 | } | |
100 | ||
b1bfcae4 JH |
101 | merge_name () { |
102 | remote="$1" | |
103 | rh=$(git-rev-parse --verify "$remote^0" 2>/dev/null) || return | |
104 | bh=$(git-show-ref -s --verify "refs/heads/$remote" 2>/dev/null) | |
105 | if test "$rh" = "$bh" | |
106 | then | |
107 | echo "$rh branch '$remote' of ." | |
108 | elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') && | |
109 | git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null | |
110 | then | |
111 | echo "$rh branch '$truname' (early part) of ." | |
85295a52 MT |
112 | elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD" |
113 | then | |
114 | sed -e 's/ not-for-merge / /' -e 1q \ | |
115 | "$GIT_DIR/FETCH_HEAD" | |
b1bfcae4 JH |
116 | else |
117 | echo "$rh commit '$remote'" | |
118 | fi | |
119 | } | |
120 | ||
fc61e313 RS |
121 | case "$#" in 0) usage ;; esac |
122 | ||
f9474132 | 123 | have_message= |
91063bbc JH |
124 | while case "$#" in 0) break ;; esac |
125 | do | |
126 | case "$1" in | |
127 | -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ | |
128 | --no-summa|--no-summar|--no-summary) | |
129 | no_summary=t ;; | |
7d0c6887 JH |
130 | --sq|--squ|--squa|--squas|--squash) |
131 | squash=t no_commit=t ;; | |
123ee3ca JH |
132 | --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) |
133 | no_commit=t ;; | |
91063bbc JH |
134 | -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ |
135 | --strateg=*|--strategy=*|\ | |
136 | -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) | |
137 | case "$#,$1" in | |
138 | *,*=*) | |
8096fae7 | 139 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
f88ed172 | 140 | 1,*) |
91063bbc JH |
141 | usage ;; |
142 | *) | |
143 | strategy="$2" | |
144 | shift ;; | |
145 | esac | |
146 | case " $all_strategies " in | |
147 | *" $strategy "*) | |
148 | use_strategies="$use_strategies$strategy " ;; | |
149 | *) | |
150 | die "available strategies are: $all_strategies" ;; | |
151 | esac | |
152 | ;; | |
17bcdad3 JH |
153 | -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*) |
154 | merge_msg=`expr "z$1" : 'z-[^=]*=\(.*\)'` | |
155 | have_message=t | |
156 | ;; | |
157 | -m|--m|--me|--mes|--mess|--messa|--messag|--message) | |
158 | shift | |
159 | case "$#" in | |
160 | 1) usage ;; | |
161 | esac | |
162 | merge_msg="$1" | |
163 | have_message=t | |
164 | ;; | |
91063bbc JH |
165 | -*) usage ;; |
166 | *) break ;; | |
167 | esac | |
168 | shift | |
169 | done | |
170 | ||
17bcdad3 JH |
171 | # This could be traditional "merge <msg> HEAD <commit>..." and the |
172 | # way we can tell it is to see if the second token is HEAD, but some | |
173 | # people might have misused the interface and used a committish that | |
174 | # is the same as HEAD there instead. Traditional format never would | |
175 | # have "-m" so it is an additional safety measure to check for it. | |
176 | ||
177 | if test -z "$have_message" && | |
178 | second_token=$(git-rev-parse --verify "$2^0" 2>/dev/null) && | |
179 | head_commit=$(git-rev-parse --verify "HEAD" 2>/dev/null) && | |
180 | test "$second_token" = "$head_commit" | |
181 | then | |
182 | merge_msg="$1" | |
183 | shift | |
184 | head_arg="$1" | |
185 | shift | |
c1751616 | 186 | elif ! git-rev-parse --verify HEAD >/dev/null 2>&1 |
8092c7f6 JH |
187 | then |
188 | # If the merged head is a valid one there is no reason to | |
189 | # forbid "git merge" into a branch yet to be born. We do | |
190 | # the same for "git pull". | |
191 | if test 1 -ne $# | |
192 | then | |
193 | echo >&2 "Can merge only exactly one commit into empty head" | |
194 | exit 1 | |
195 | fi | |
196 | ||
197 | rh=$(git rev-parse --verify "$1^0") || | |
198 | die "$1 - not something we can merge" | |
199 | ||
200 | git-update-ref -m "initial pull" HEAD "$rh" "" && | |
201 | git-read-tree --reset -u HEAD | |
202 | exit | |
203 | ||
17bcdad3 JH |
204 | else |
205 | # We are invoked directly as the first-class UI. | |
206 | head_arg=HEAD | |
207 | ||
208 | # All the rest are the commits being merged; prepare | |
209 | # the standard merge summary message to be appended to | |
210 | # the given message. If remote is invalid we will die | |
211 | # later in the common codepath so we discard the error | |
212 | # in this loop. | |
213 | merge_name=$(for remote | |
214 | do | |
b1bfcae4 | 215 | merge_name "$remote" |
17bcdad3 JH |
216 | done | git-fmt-merge-msg |
217 | ) | |
218 | merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name" | |
219 | fi | |
220 | head=$(git-rev-parse --verify "$head_arg"^0) || usage | |
91063bbc JH |
221 | |
222 | # All the rest are remote heads | |
6ea23343 | 223 | test "$#" = 0 && usage ;# we need at least one remote head. |
7f9acb2a | 224 | set_reflog_action "merge $*" |
6ea23343 | 225 | |
9954f5b8 | 226 | remoteheads= |
91063bbc JH |
227 | for remote |
228 | do | |
51901e96 | 229 | remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) || |
91063bbc | 230 | die "$remote - not something we can merge" |
9954f5b8 | 231 | remoteheads="${remoteheads}$remotehead " |
e0ec1819 SP |
232 | eval GITHEAD_$remotehead='"$remote"' |
233 | export GITHEAD_$remotehead | |
91063bbc | 234 | done |
9954f5b8 | 235 | set x $remoteheads ; shift |
91063bbc | 236 | |
6ea23343 JH |
237 | case "$use_strategies" in |
238 | '') | |
239 | case "$#" in | |
240 | 1) | |
e0d10e1c | 241 | var="`git-config --get pull.twohead`" |
de811948 SP |
242 | if test -n "$var" |
243 | then | |
244 | use_strategies="$var" | |
245 | else | |
246 | use_strategies="$default_twohead_strategies" | |
247 | fi ;; | |
6ea23343 | 248 | *) |
e0d10e1c | 249 | var="`git-config --get pull.octopus`" |
de811948 SP |
250 | if test -n "$var" |
251 | then | |
252 | use_strategies="$var" | |
253 | else | |
254 | use_strategies="$default_octopus_strategies" | |
255 | fi ;; | |
6ea23343 JH |
256 | esac |
257 | ;; | |
258 | esac | |
259 | ||
260 | for s in $use_strategies | |
261 | do | |
de6f0def JH |
262 | for nt in $no_trivial_merge_strategies |
263 | do | |
264 | case " $s " in | |
265 | *" $nt "*) | |
266 | index_merge=f | |
267 | break | |
268 | ;; | |
269 | esac | |
270 | done | |
6ea23343 JH |
271 | done |
272 | ||
13956670 JH |
273 | case "$#" in |
274 | 1) | |
275 | common=$(git-merge-base --all $head "$@") | |
276 | ;; | |
277 | *) | |
278 | common=$(git-show-branch --merge-base $head "$@") | |
279 | ;; | |
280 | esac | |
91063bbc JH |
281 | echo "$head" >"$GIT_DIR/ORIG_HEAD" |
282 | ||
6ea23343 JH |
283 | case "$index_merge,$#,$common,$no_commit" in |
284 | f,*) | |
285 | # We've been told not to try anything clever. Skip to real merge. | |
286 | ;; | |
287 | ?,*,'',*) | |
88f8f0a5 | 288 | # No common ancestors found. We need a real merge. |
91063bbc | 289 | ;; |
6ea23343 | 290 | ?,1,"$1",*) |
91063bbc | 291 | # If head can reach all the merge then we are up to date. |
6ea23343 | 292 | # but first the most common case of merging one remote. |
7d0c6887 | 293 | finish_up_to_date "Already up-to-date." |
91063bbc JH |
294 | exit 0 |
295 | ;; | |
6ea23343 | 296 | ?,1,"$head",*) |
91063bbc | 297 | # Again the most common case of merging one remote. |
ba0ac36e | 298 | echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)" |
91063bbc | 299 | git-update-index --refresh 2>/dev/null |
be242d57 BF |
300 | msg="Fast forward" |
301 | if test -n "$have_message" | |
302 | then | |
303 | msg="$msg (no commit created; -m option ignored)" | |
304 | fi | |
2be08a84 SB |
305 | new_head=$(git-rev-parse --verify "$1^0") && |
306 | git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && | |
be242d57 | 307 | finish "$new_head" "$msg" || exit |
a9358240 | 308 | dropsave |
91063bbc JH |
309 | exit 0 |
310 | ;; | |
6ea23343 | 311 | ?,1,?*"$LF"?*,*) |
91063bbc JH |
312 | # We are not doing octopus and not fast forward. Need a |
313 | # real merge. | |
314 | ;; | |
6ea23343 | 315 | ?,1,*,) |
f9d72413 | 316 | # We are not doing octopus, not fast forward, and have only |
c82d7117 | 317 | # one common. |
f9d72413 | 318 | git-update-index --refresh 2>/dev/null |
c82d7117 SP |
319 | case " $use_strategies " in |
320 | *' recursive '*|*' recur '*) | |
321 | : run merge later | |
322 | ;; | |
323 | *) | |
324 | # See if it is really trivial. | |
325 | git var GIT_COMMITTER_IDENT >/dev/null || exit | |
326 | echo "Trying really trivial in-index merge..." | |
327 | if git-read-tree --trivial -m -u -v $common $head "$1" && | |
328 | result_tree=$(git-write-tree) | |
329 | then | |
330 | echo "Wonderful." | |
331 | result_commit=$( | |
332 | echo "$merge_msg" | | |
333 | git-commit-tree $result_tree -p HEAD -p "$1" | |
334 | ) || exit | |
335 | finish "$result_commit" "In-index merge" | |
336 | dropsave | |
337 | exit 0 | |
338 | fi | |
339 | echo "Nope." | |
340 | esac | |
f9d72413 | 341 | ;; |
91063bbc JH |
342 | *) |
343 | # An octopus. If we can reach all the remote we are up to date. | |
344 | up_to_date=t | |
345 | for remote | |
346 | do | |
13956670 | 347 | common_one=$(git-merge-base --all $head $remote) |
91063bbc JH |
348 | if test "$common_one" != "$remote" |
349 | then | |
350 | up_to_date=f | |
351 | break | |
352 | fi | |
353 | done | |
354 | if test "$up_to_date" = t | |
355 | then | |
7d0c6887 | 356 | finish_up_to_date "Already up-to-date. Yeeah!" |
91063bbc JH |
357 | exit 0 |
358 | fi | |
359 | ;; | |
360 | esac | |
361 | ||
e3b59a44 JH |
362 | # We are going to make a new commit. |
363 | git var GIT_COMMITTER_IDENT >/dev/null || exit | |
364 | ||
a9358240 JH |
365 | # At this point, we need a real merge. No matter what strategy |
366 | # we use, it would operate on the index, possibly affecting the | |
367 | # working tree, and when resolved cleanly, have the desired tree | |
368 | # in the index -- this means that the index must be in sync with | |
60fa0560 | 369 | # the $head commit. The strategies are responsible to ensure this. |
91063bbc | 370 | |
a9358240 JH |
371 | case "$use_strategies" in |
372 | ?*' '?*) | |
373 | # Stash away the local changes so that we can try more than one. | |
374 | savestate | |
375 | single_strategy=no | |
376 | ;; | |
377 | *) | |
deca7e8c | 378 | rm -f "$GIT_DIR/MERGE_SAVE" |
a9358240 JH |
379 | single_strategy=yes |
380 | ;; | |
381 | esac | |
91063bbc JH |
382 | |
383 | result_tree= best_cnt=-1 best_strategy= wt_strategy= | |
695bf722 | 384 | merge_was_ok= |
91063bbc JH |
385 | for strategy in $use_strategies |
386 | do | |
387 | test "$wt_strategy" = '' || { | |
388 | echo "Rewinding the tree to pristine..." | |
a9358240 | 389 | restorestate |
91063bbc | 390 | } |
a9358240 JH |
391 | case "$single_strategy" in |
392 | no) | |
393 | echo "Trying merge strategy $strategy..." | |
394 | ;; | |
395 | esac | |
396 | ||
397 | # Remember which strategy left the state in the working tree | |
91063bbc | 398 | wt_strategy=$strategy |
a9358240 | 399 | |
123ee3ca JH |
400 | git-merge-$strategy $common -- "$head_arg" "$@" |
401 | exit=$? | |
402 | if test "$no_commit" = t && test "$exit" = 0 | |
403 | then | |
695bf722 | 404 | merge_was_ok=t |
123ee3ca JH |
405 | exit=1 ;# pretend it left conflicts. |
406 | fi | |
407 | ||
408 | test "$exit" = 0 || { | |
91063bbc JH |
409 | |
410 | # The backend exits with 1 when conflicts are left to be resolved, | |
411 | # with 2 when it does not handle the given merge at all. | |
412 | ||
91063bbc JH |
413 | if test "$exit" -eq 1 |
414 | then | |
415 | cnt=`{ | |
416 | git-diff-files --name-only | |
417 | git-ls-files --unmerged | |
418 | } | wc -l` | |
419 | if test $best_cnt -le 0 -o $cnt -le $best_cnt | |
420 | then | |
421 | best_strategy=$strategy | |
422 | best_cnt=$cnt | |
423 | fi | |
424 | fi | |
425 | continue | |
426 | } | |
427 | ||
428 | # Automerge succeeded. | |
429 | result_tree=$(git-write-tree) && break | |
430 | done | |
431 | ||
432 | # If we have a resulting tree, that means the strategy module | |
433 | # auto resolved the merge cleanly. | |
434 | if test '' != "$result_tree" | |
435 | then | |
6ea23343 | 436 | parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /') |
bf7960eb | 437 | result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit |
e1447e38 | 438 | finish "$result_commit" "Merge made by $wt_strategy." |
a9358240 | 439 | dropsave |
91063bbc JH |
440 | exit 0 |
441 | fi | |
442 | ||
443 | # Pick the result from the best strategy and have the user fix it up. | |
444 | case "$best_strategy" in | |
445 | '') | |
a9358240 | 446 | restorestate |
0c4e95d0 JH |
447 | case "$use_strategies" in |
448 | ?*' '?*) | |
449 | echo >&2 "No merge strategy handled the merge." | |
450 | ;; | |
451 | *) | |
452 | echo >&2 "Merge with strategy $use_strategies failed." | |
453 | ;; | |
454 | esac | |
4275df51 | 455 | exit 2 |
91063bbc JH |
456 | ;; |
457 | "$wt_strategy") | |
458 | # We already have its result in the working tree. | |
459 | ;; | |
460 | *) | |
461 | echo "Rewinding the tree to pristine..." | |
a9358240 | 462 | restorestate |
91063bbc | 463 | echo "Using the $best_strategy to prepare resolving by hand." |
a9358240 | 464 | git-merge-$best_strategy $common -- "$head_arg" "$@" |
91063bbc JH |
465 | ;; |
466 | esac | |
7d0c6887 JH |
467 | |
468 | if test "$squash" = t | |
469 | then | |
470 | finish | |
471 | else | |
472 | for remote | |
473 | do | |
474 | echo $remote | |
475 | done >"$GIT_DIR/MERGE_HEAD" | |
476 | echo "$merge_msg" >"$GIT_DIR/MERGE_MSG" | |
477 | fi | |
deca7e8c | 478 | |
695bf722 JH |
479 | if test "$merge_was_ok" = t |
480 | then | |
481 | echo >&2 \ | |
482 | "Automatic merge went well; stopped before committing as requested" | |
483 | exit 0 | |
484 | else | |
6b94f1e4 JH |
485 | { |
486 | echo ' | |
487 | Conflicts: | |
488 | ' | |
489 | git ls-files --unmerged | | |
490 | sed -e 's/^[^ ]* / /' | | |
491 | uniq | |
492 | } >>"$GIT_DIR/MERGE_MSG" | |
1536dd9c JH |
493 | if test -d "$GIT_DIR/rr-cache" |
494 | then | |
495 | git-rerere | |
496 | fi | |
50ac7408 | 497 | die "Automatic merge failed; fix conflicts and then commit the result." |
695bf722 | 498 | fi |