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