]>
Commit | Line | Data |
---|---|---|
c4b4a5af TT |
1 | #!/bin/sh |
2 | # | |
3 | # This program resolves merge conflicts in git | |
4 | # | |
5 | # Copyright (c) 2006 Theodore Y. Ts'o | |
6 | # | |
7 | # This file is licensed under the GPL v2, or a later version | |
2571ac67 | 8 | # at the discretion of Junio C Hamano. |
c4b4a5af TT |
9 | # |
10 | ||
109859e2 | 11 | USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...' |
c4b4a5af | 12 | SUBDIRECTORY_OK=Yes |
8f321a39 | 13 | OPTIONS_SPEC= |
21d0ba7e | 14 | TOOL_MODE=merge |
c4b4a5af | 15 | . git-sh-setup |
21d0ba7e | 16 | . git-mergetool--lib |
c4b4a5af TT |
17 | require_work_tree |
18 | ||
19 | # Returns true if the mode reflects a symlink | |
262c981e | 20 | is_symlink () { |
f8750a0e | 21 | test "$1" = 120000 |
c4b4a5af TT |
22 | } |
23 | ||
ff7f089e | 24 | is_submodule () { |
f8750a0e | 25 | test "$1" = 160000 |
ff7f089e JM |
26 | } |
27 | ||
262c981e | 28 | local_present () { |
f8750a0e | 29 | test -n "$local_mode" |
c4b4a5af TT |
30 | } |
31 | ||
262c981e | 32 | remote_present () { |
f8750a0e | 33 | test -n "$remote_mode" |
c4b4a5af TT |
34 | } |
35 | ||
262c981e | 36 | base_present () { |
f8750a0e | 37 | test -n "$base_mode" |
c4b4a5af TT |
38 | } |
39 | ||
40 | cleanup_temp_files () { | |
f8750a0e JH |
41 | if test "$1" = --save-backup |
42 | then | |
43 | rm -rf -- "$MERGED.orig" | |
44 | test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig" | |
45 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" | |
46 | else | |
47 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP" | |
48 | fi | |
c4b4a5af TT |
49 | } |
50 | ||
262c981e | 51 | describe_file () { |
f8750a0e JH |
52 | mode="$1" |
53 | branch="$2" | |
54 | file="$3" | |
55 | ||
56 | printf " {%s}: " "$branch" | |
57 | if test -z "$mode" | |
58 | then | |
59 | echo "deleted" | |
60 | elif is_symlink "$mode" | |
61 | then | |
62 | echo "a symbolic link -> '$(cat "$file")'" | |
63 | elif is_submodule "$mode" | |
64 | then | |
65 | echo "submodule commit $file" | |
66 | elif base_present | |
67 | then | |
68 | echo "modified file" | |
c4b4a5af | 69 | else |
f8750a0e | 70 | echo "created file" |
c4b4a5af | 71 | fi |
c4b4a5af TT |
72 | } |
73 | ||
c4b4a5af | 74 | resolve_symlink_merge () { |
f8750a0e JH |
75 | while true |
76 | do | |
77 | printf "Use (l)ocal or (r)emote, or (a)bort? " | |
78 | read ans || return 1 | |
79 | case "$ans" in | |
80 | [lL]*) | |
81 | git checkout-index -f --stage=2 -- "$MERGED" | |
82 | git add -- "$MERGED" | |
83 | cleanup_temp_files --save-backup | |
84 | return 0 | |
85 | ;; | |
86 | [rR]*) | |
87 | git checkout-index -f --stage=3 -- "$MERGED" | |
88 | git add -- "$MERGED" | |
89 | cleanup_temp_files --save-backup | |
90 | return 0 | |
91 | ;; | |
92 | [aA]*) | |
93 | return 1 | |
94 | ;; | |
95 | esac | |
c4b4a5af TT |
96 | done |
97 | } | |
98 | ||
99 | resolve_deleted_merge () { | |
f8750a0e JH |
100 | while true |
101 | do | |
102 | if base_present | |
103 | then | |
104 | printf "Use (m)odified or (d)eleted file, or (a)bort? " | |
105 | else | |
106 | printf "Use (c)reated or (d)eleted file, or (a)bort? " | |
107 | fi | |
108 | read ans || return 1 | |
109 | case "$ans" in | |
110 | [mMcC]*) | |
111 | git add -- "$MERGED" | |
112 | cleanup_temp_files --save-backup | |
113 | return 0 | |
114 | ;; | |
115 | [dD]*) | |
116 | git rm -- "$MERGED" > /dev/null | |
117 | cleanup_temp_files | |
118 | return 0 | |
119 | ;; | |
120 | [aA]*) | |
121 | return 1 | |
122 | ;; | |
123 | esac | |
c4b4a5af TT |
124 | done |
125 | } | |
126 | ||
ff7f089e | 127 | resolve_submodule_merge () { |
f8750a0e JH |
128 | while true |
129 | do | |
130 | printf "Use (l)ocal or (r)emote, or (a)bort? " | |
131 | read ans || return 1 | |
132 | case "$ans" in | |
133 | [lL]*) | |
134 | if ! local_present | |
135 | then | |
136 | if test -n "$(git ls-tree HEAD -- "$MERGED")" | |
137 | then | |
138 | # Local isn't present, but it's a subdirectory | |
139 | git ls-tree --full-name -r HEAD -- "$MERGED" | | |
140 | git update-index --index-info || exit $? | |
141 | else | |
142 | test -e "$MERGED" && mv -- "$MERGED" "$BACKUP" | |
143 | git update-index --force-remove "$MERGED" | |
144 | cleanup_temp_files --save-backup | |
145 | fi | |
146 | elif is_submodule "$local_mode" | |
147 | then | |
148 | stage_submodule "$MERGED" "$local_sha1" | |
149 | else | |
150 | git checkout-index -f --stage=2 -- "$MERGED" | |
151 | git add -- "$MERGED" | |
152 | fi | |
153 | return 0 | |
154 | ;; | |
155 | [rR]*) | |
156 | if ! remote_present | |
157 | then | |
158 | if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")" | |
159 | then | |
160 | # Remote isn't present, but it's a subdirectory | |
161 | git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" | | |
162 | git update-index --index-info || exit $? | |
163 | else | |
164 | test -e "$MERGED" && mv -- "$MERGED" "$BACKUP" | |
165 | git update-index --force-remove "$MERGED" | |
166 | fi | |
167 | elif is_submodule "$remote_mode" | |
168 | then | |
169 | ! is_submodule "$local_mode" && | |
170 | test -e "$MERGED" && | |
171 | mv -- "$MERGED" "$BACKUP" | |
172 | stage_submodule "$MERGED" "$remote_sha1" | |
173 | else | |
174 | test -e "$MERGED" && mv -- "$MERGED" "$BACKUP" | |
175 | git checkout-index -f --stage=3 -- "$MERGED" | |
176 | git add -- "$MERGED" | |
177 | fi | |
ff7f089e | 178 | cleanup_temp_files --save-backup |
f8750a0e JH |
179 | return 0 |
180 | ;; | |
181 | [aA]*) | |
182 | return 1 | |
183 | ;; | |
184 | esac | |
ff7f089e JM |
185 | done |
186 | } | |
187 | ||
188 | stage_submodule () { | |
f8750a0e JH |
189 | path="$1" |
190 | submodule_sha1="$2" | |
191 | mkdir -p "$path" || | |
192 | die "fatal: unable to create directory for module at $path" | |
193 | # Find $path relative to work tree | |
194 | work_tree_root=$(cd_to_toplevel && pwd) | |
195 | work_rel_path=$(cd "$path" && | |
196 | GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix | |
197 | ) | |
198 | test -n "$work_rel_path" || | |
199 | die "fatal: unable to get path of module $path relative to work tree" | |
200 | git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die | |
ff7f089e JM |
201 | } |
202 | ||
0ec7b6c2 | 203 | checkout_staged_file () { |
f8750a0e JH |
204 | tmpfile=$(expr \ |
205 | "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \ | |
206 | : '\([^ ]*\) ') | |
207 | ||
208 | if test $? -eq 0 -a -n "$tmpfile" | |
209 | then | |
210 | mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3" | |
211 | else | |
212 | >"$3" | |
213 | fi | |
0ec7b6c2 CB |
214 | } |
215 | ||
c4b4a5af | 216 | merge_file () { |
f8750a0e | 217 | MERGED="$1" |
c4b4a5af | 218 | |
f8750a0e JH |
219 | f=$(git ls-files -u -- "$MERGED") |
220 | if test -z "$f" | |
221 | then | |
222 | if test ! -f "$MERGED" | |
223 | then | |
224 | echo "$MERGED: file not found" | |
225 | else | |
226 | echo "$MERGED: file does not need merging" | |
227 | fi | |
228 | return 1 | |
ce5b6d75 | 229 | fi |
c4b4a5af | 230 | |
f8750a0e JH |
231 | ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" |
232 | BACKUP="./$MERGED.BACKUP.$ext" | |
233 | LOCAL="./$MERGED.LOCAL.$ext" | |
234 | REMOTE="./$MERGED.REMOTE.$ext" | |
235 | BASE="./$MERGED.BASE.$ext" | |
236 | ||
237 | base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}') | |
238 | local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}') | |
239 | remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}') | |
240 | ||
241 | if is_submodule "$local_mode" || is_submodule "$remote_mode" | |
242 | then | |
243 | echo "Submodule merge conflict for '$MERGED':" | |
244 | local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}') | |
245 | remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}') | |
246 | describe_file "$local_mode" "local" "$local_sha1" | |
247 | describe_file "$remote_mode" "remote" "$remote_sha1" | |
248 | resolve_submodule_merge | |
249 | return | |
250 | fi | |
251 | ||
252 | mv -- "$MERGED" "$BACKUP" | |
253 | cp -- "$BACKUP" "$MERGED" | |
254 | ||
255 | checkout_staged_file 1 "$MERGED" "$BASE" | |
256 | checkout_staged_file 2 "$MERGED" "$LOCAL" | |
257 | checkout_staged_file 3 "$MERGED" "$REMOTE" | |
258 | ||
259 | if test -z "$local_mode" -o -z "$remote_mode" | |
260 | then | |
261 | echo "Deleted merge conflict for '$MERGED':" | |
262 | describe_file "$local_mode" "local" "$LOCAL" | |
263 | describe_file "$remote_mode" "remote" "$REMOTE" | |
264 | resolve_deleted_merge | |
265 | return | |
266 | fi | |
267 | ||
268 | if is_symlink "$local_mode" || is_symlink "$remote_mode" | |
269 | then | |
270 | echo "Symbolic link merge conflict for '$MERGED':" | |
271 | describe_file "$local_mode" "local" "$LOCAL" | |
272 | describe_file "$remote_mode" "remote" "$REMOTE" | |
273 | resolve_symlink_merge | |
274 | return | |
275 | fi | |
276 | ||
277 | echo "Normal merge conflict for '$MERGED':" | |
c4b4a5af TT |
278 | describe_file "$local_mode" "local" "$LOCAL" |
279 | describe_file "$remote_mode" "remote" "$REMOTE" | |
f8750a0e JH |
280 | if "$prompt" = true |
281 | then | |
282 | printf "Hit return to start merge resolution tool (%s): " "$merge_tool" | |
283 | read ans || return 1 | |
162eba8b CB |
284 | fi |
285 | ||
f8750a0e JH |
286 | if base_present |
287 | then | |
288 | present=true | |
289 | else | |
290 | present=false | |
291 | fi | |
292 | ||
293 | if ! run_merge_tool "$merge_tool" "$present" | |
294 | then | |
295 | echo "merge of $MERGED failed" 1>&2 | |
296 | mv -- "$BACKUP" "$MERGED" | |
297 | ||
298 | if test "$merge_keep_temporaries" = "false" | |
299 | then | |
300 | cleanup_temp_files | |
301 | fi | |
44c36d1c | 302 | |
f8750a0e JH |
303 | return 1 |
304 | fi | |
44c36d1c | 305 | |
f8750a0e JH |
306 | if test "$merge_keep_backup" = "true" |
307 | then | |
308 | mv -- "$BACKUP" "$MERGED.orig" | |
309 | else | |
310 | rm -- "$BACKUP" | |
311 | fi | |
312 | ||
313 | git add -- "$MERGED" | |
314 | cleanup_temp_files | |
315 | return 0 | |
c4b4a5af TT |
316 | } |
317 | ||
109859e2 JH |
318 | show_tool_help () { |
319 | TOOL_MODE=merge | |
320 | list_merge_tool_candidates | |
321 | unavailable= available= LF=' | |
322 | ' | |
323 | for i in $tools | |
324 | do | |
325 | merge_tool_path=$(translate_merge_tool_path "$i") | |
326 | if type "$merge_tool_path" >/dev/null 2>&1 | |
327 | then | |
328 | available="$available$i$LF" | |
329 | else | |
330 | unavailable="$unavailable$i$LF" | |
331 | fi | |
332 | done | |
333 | if test -n "$available" | |
334 | then | |
335 | echo "'git mergetool --tool=<tool>' may be set to one of the following:" | |
336 | echo "$available" | sort | sed -e 's/^/ /' | |
337 | else | |
338 | echo "No suitable tool for 'git mergetool --tool=<tool>' found." | |
339 | fi | |
340 | if test -n "$unavailable" | |
341 | then | |
342 | echo | |
343 | echo 'The following tools are valid, but not currently available:' | |
344 | echo "$unavailable" | sort | sed -e 's/^/ /' | |
345 | fi | |
346 | if test -n "$unavailable$available" | |
347 | then | |
348 | echo | |
349 | echo "Some of the tools listed above only work in a windowed" | |
350 | echo "environment. If run in a terminal-only session, they will fail." | |
351 | fi | |
352 | exit 0 | |
353 | } | |
354 | ||
682b451f CB |
355 | prompt=$(git config --bool mergetool.prompt || echo true) |
356 | ||
822f7c73 | 357 | while test $# != 0 |
c4b4a5af | 358 | do |
f8750a0e | 359 | case "$1" in |
109859e2 JH |
360 | --tool-help) |
361 | show_tool_help | |
362 | ;; | |
c4b4a5af | 363 | -t|--tool*) |
f8750a0e | 364 | case "$#,$1" in |
c4b4a5af | 365 | *,*=*) |
f8750a0e JH |
366 | merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)') |
367 | ;; | |
c4b4a5af | 368 | 1,*) |
f8750a0e | 369 | usage ;; |
c4b4a5af | 370 | *) |
f8750a0e JH |
371 | merge_tool="$2" |
372 | shift ;; | |
373 | esac | |
374 | ;; | |
682b451f | 375 | -y|--no-prompt) |
f8750a0e JH |
376 | prompt=false |
377 | ;; | |
682b451f | 378 | --prompt) |
f8750a0e JH |
379 | prompt=true |
380 | ;; | |
c4b4a5af | 381 | --) |
f8750a0e JH |
382 | shift |
383 | break | |
384 | ;; | |
c4b4a5af | 385 | -*) |
f8750a0e | 386 | usage |
b0169d84 | 387 | ;; |
f8750a0e JH |
388 | *) |
389 | break | |
b0169d84 CB |
390 | ;; |
391 | esac | |
f8750a0e JH |
392 | shift |
393 | done | |
394 | ||
395 | prompt_after_failed_merge () { | |
396 | while true | |
397 | do | |
398 | printf "Continue merging other unresolved paths (y/n) ? " | |
399 | read ans || return 1 | |
400 | case "$ans" in | |
401 | [yY]*) | |
402 | return 0 | |
403 | ;; | |
404 | [nN]*) | |
405 | return 1 | |
406 | ;; | |
407 | esac | |
408 | done | |
b0169d84 | 409 | } |
e3fa2c76 | 410 | |
f8750a0e JH |
411 | if test -z "$merge_tool" |
412 | then | |
413 | merge_tool=$(get_merge_tool "$merge_tool") || exit | |
47d65924 | 414 | fi |
70af4e9b | 415 | merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)" |
21d0ba7e | 416 | merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)" |
c4b4a5af | 417 | |
b0169d84 CB |
418 | last_status=0 |
419 | rollup_status=0 | |
3e8e691a | 420 | files= |
c4b4a5af | 421 | |
f8750a0e JH |
422 | if test $# -eq 0 |
423 | then | |
424 | cd_to_toplevel | |
bb0a484e | 425 | |
f8750a0e JH |
426 | if test -e "$GIT_DIR/MERGE_RR" |
427 | then | |
428 | files=$(git rerere remaining) | |
429 | else | |
430 | files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u) | |
431 | fi | |
3e8e691a | 432 | else |
f8750a0e | 433 | files=$(git ls-files -u -- "$@" | sed -e 's/^[^ ]* //' | sort -u) |
3e8e691a | 434 | fi |
af314714 | 435 | |
f8750a0e JH |
436 | if test -z "$files" |
437 | then | |
438 | echo "No files need merging" | |
439 | exit 0 | |
3e8e691a | 440 | fi |
af314714 | 441 | |
3e8e691a JM |
442 | printf "Merging:\n" |
443 | printf "$files\n" | |
bb0a484e | 444 | |
3e8e691a | 445 | IFS=' |
6d9990a9 JH |
446 | ' |
447 | for i in $files | |
3e8e691a | 448 | do |
f8750a0e JH |
449 | if test $last_status -ne 0 |
450 | then | |
451 | prompt_after_failed_merge || exit 1 | |
452 | fi | |
453 | printf "\n" | |
454 | merge_file "$i" | |
455 | last_status=$? | |
456 | if test $last_status -ne 0 | |
457 | then | |
458 | rollup_status=1 | |
459 | fi | |
3e8e691a | 460 | done |
b0169d84 CB |
461 | |
462 | exit $rollup_status |