]>
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 | ||
682b451f | 11 | USAGE='[--tool=tool] [-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 () { |
c4b4a5af TT |
21 | test "$1" = 120000 |
22 | } | |
23 | ||
262c981e | 24 | local_present () { |
c4b4a5af TT |
25 | test -n "$local_mode" |
26 | } | |
27 | ||
262c981e | 28 | remote_present () { |
c4b4a5af TT |
29 | test -n "$remote_mode" |
30 | } | |
31 | ||
262c981e | 32 | base_present () { |
c4b4a5af TT |
33 | test -n "$base_mode" |
34 | } | |
35 | ||
36 | cleanup_temp_files () { | |
37 | if test "$1" = --save-backup ; then | |
b3ea27e4 | 38 | mv -- "$BACKUP" "$MERGED.orig" |
c4b4a5af TT |
39 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" |
40 | else | |
41 | rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP" | |
42 | fi | |
43 | } | |
44 | ||
262c981e | 45 | describe_file () { |
c4b4a5af TT |
46 | mode="$1" |
47 | branch="$2" | |
48 | file="$3" | |
49 | ||
27090aa1 | 50 | printf " {%s}: " "$branch" |
c4b4a5af | 51 | if test -z "$mode"; then |
27090aa1 | 52 | echo "deleted" |
c4b4a5af | 53 | elif is_symlink "$mode" ; then |
27090aa1 | 54 | echo "a symbolic link -> '$(cat "$file")'" |
c4b4a5af TT |
55 | else |
56 | if base_present; then | |
27090aa1 | 57 | echo "modified" |
c4b4a5af | 58 | else |
27090aa1 | 59 | echo "created" |
c4b4a5af TT |
60 | fi |
61 | fi | |
c4b4a5af TT |
62 | } |
63 | ||
64 | ||
65 | resolve_symlink_merge () { | |
d1dc6959 | 66 | while true; do |
27090aa1 | 67 | printf "Use (l)ocal or (r)emote, or (a)bort? " |
c4b4a5af TT |
68 | read ans |
69 | case "$ans" in | |
70 | [lL]*) | |
b3ea27e4 CB |
71 | git checkout-index -f --stage=2 -- "$MERGED" |
72 | git add -- "$MERGED" | |
c4b4a5af | 73 | cleanup_temp_files --save-backup |
b0169d84 | 74 | return 0 |
c4b4a5af | 75 | ;; |
5a174f1a | 76 | [rR]*) |
b3ea27e4 CB |
77 | git checkout-index -f --stage=3 -- "$MERGED" |
78 | git add -- "$MERGED" | |
c4b4a5af | 79 | cleanup_temp_files --save-backup |
b0169d84 | 80 | return 0 |
c4b4a5af | 81 | ;; |
5a174f1a | 82 | [aA]*) |
b0169d84 | 83 | return 1 |
c4b4a5af TT |
84 | ;; |
85 | esac | |
86 | done | |
87 | } | |
88 | ||
89 | resolve_deleted_merge () { | |
d1dc6959 | 90 | while true; do |
27090aa1 TT |
91 | if base_present; then |
92 | printf "Use (m)odified or (d)eleted file, or (a)bort? " | |
93 | else | |
94 | printf "Use (c)reated or (d)eleted file, or (a)bort? " | |
95 | fi | |
c4b4a5af TT |
96 | read ans |
97 | case "$ans" in | |
27090aa1 | 98 | [mMcC]*) |
b3ea27e4 | 99 | git add -- "$MERGED" |
c4b4a5af | 100 | cleanup_temp_files --save-backup |
b0169d84 | 101 | return 0 |
c4b4a5af | 102 | ;; |
5a174f1a | 103 | [dD]*) |
b3ea27e4 | 104 | git rm -- "$MERGED" > /dev/null |
c4b4a5af | 105 | cleanup_temp_files |
b0169d84 | 106 | return 0 |
c4b4a5af | 107 | ;; |
5a174f1a | 108 | [aA]*) |
b0169d84 | 109 | return 1 |
c4b4a5af TT |
110 | ;; |
111 | esac | |
112 | done | |
113 | } | |
114 | ||
0ec7b6c2 CB |
115 | checkout_staged_file () { |
116 | tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ') | |
117 | ||
118 | if test $? -eq 0 -a -n "$tmpfile" ; then | |
ff4a1855 | 119 | mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3" |
0ec7b6c2 CB |
120 | fi |
121 | } | |
122 | ||
c4b4a5af | 123 | merge_file () { |
b3ea27e4 | 124 | MERGED="$1" |
c4b4a5af | 125 | |
9a62d72d | 126 | f=$(git ls-files -u -- "$MERGED") |
c4b4a5af | 127 | if test -z "$f" ; then |
b3ea27e4 CB |
128 | if test ! -f "$MERGED" ; then |
129 | echo "$MERGED: file not found" | |
ce5b6d75 | 130 | else |
b3ea27e4 | 131 | echo "$MERGED: file does not need merging" |
ce5b6d75 | 132 | fi |
b0169d84 | 133 | return 1 |
c4b4a5af TT |
134 | fi |
135 | ||
b3ea27e4 | 136 | ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" |
641dba49 PH |
137 | BACKUP="./$MERGED.BACKUP.$ext" |
138 | LOCAL="./$MERGED.LOCAL.$ext" | |
139 | REMOTE="./$MERGED.REMOTE.$ext" | |
140 | BASE="./$MERGED.BASE.$ext" | |
c4b4a5af | 141 | |
b3ea27e4 CB |
142 | mv -- "$MERGED" "$BACKUP" |
143 | cp -- "$BACKUP" "$MERGED" | |
c4b4a5af | 144 | |
9a62d72d DA |
145 | base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}') |
146 | local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}') | |
147 | remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}') | |
c4b4a5af | 148 | |
ff4a1855 CB |
149 | base_present && checkout_staged_file 1 "$MERGED" "$BASE" |
150 | local_present && checkout_staged_file 2 "$MERGED" "$LOCAL" | |
151 | remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE" | |
c4b4a5af TT |
152 | |
153 | if test -z "$local_mode" -o -z "$remote_mode"; then | |
b3ea27e4 | 154 | echo "Deleted merge conflict for '$MERGED':" |
c4b4a5af TT |
155 | describe_file "$local_mode" "local" "$LOCAL" |
156 | describe_file "$remote_mode" "remote" "$REMOTE" | |
157 | resolve_deleted_merge | |
158 | return | |
159 | fi | |
160 | ||
161 | if is_symlink "$local_mode" || is_symlink "$remote_mode"; then | |
b3ea27e4 | 162 | echo "Symbolic link merge conflict for '$MERGED':" |
c4b4a5af TT |
163 | describe_file "$local_mode" "local" "$LOCAL" |
164 | describe_file "$remote_mode" "remote" "$REMOTE" | |
165 | resolve_symlink_merge | |
166 | return | |
167 | fi | |
168 | ||
b3ea27e4 | 169 | echo "Normal merge conflict for '$MERGED':" |
c4b4a5af TT |
170 | describe_file "$local_mode" "local" "$LOCAL" |
171 | describe_file "$remote_mode" "remote" "$REMOTE" | |
682b451f CB |
172 | if "$prompt" = true; then |
173 | printf "Hit return to start merge resolution tool (%s): " "$merge_tool" | |
174 | read ans | |
175 | fi | |
c4b4a5af | 176 | |
47d65924 DA |
177 | if base_present; then |
178 | present=true | |
179 | else | |
180 | present=false | |
181 | fi | |
21d0ba7e DA |
182 | |
183 | if ! run_merge_tool "$merge_tool" "$present"; then | |
b3ea27e4 CB |
184 | echo "merge of $MERGED failed" 1>&2 |
185 | mv -- "$BACKUP" "$MERGED" | |
162eba8b CB |
186 | |
187 | if test "$merge_keep_temporaries" = "false"; then | |
188 | cleanup_temp_files | |
189 | fi | |
190 | ||
b0169d84 | 191 | return 1 |
c4b4a5af | 192 | fi |
44c36d1c CB |
193 | |
194 | if test "$merge_keep_backup" = "true"; then | |
b3ea27e4 | 195 | mv -- "$BACKUP" "$MERGED.orig" |
44c36d1c CB |
196 | else |
197 | rm -- "$BACKUP" | |
198 | fi | |
199 | ||
b3ea27e4 | 200 | git add -- "$MERGED" |
c4b4a5af | 201 | cleanup_temp_files |
b0169d84 | 202 | return 0 |
c4b4a5af TT |
203 | } |
204 | ||
682b451f CB |
205 | prompt=$(git config --bool mergetool.prompt || echo true) |
206 | ||
822f7c73 | 207 | while test $# != 0 |
c4b4a5af TT |
208 | do |
209 | case "$1" in | |
210 | -t|--tool*) | |
211 | case "$#,$1" in | |
212 | *,*=*) | |
9a62d72d | 213 | merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)') |
c4b4a5af TT |
214 | ;; |
215 | 1,*) | |
216 | usage ;; | |
217 | *) | |
218 | merge_tool="$2" | |
219 | shift ;; | |
220 | esac | |
221 | ;; | |
682b451f CB |
222 | -y|--no-prompt) |
223 | prompt=false | |
224 | ;; | |
225 | --prompt) | |
226 | prompt=true | |
227 | ;; | |
c4b4a5af | 228 | --) |
ce2c3ebb | 229 | shift |
c4b4a5af TT |
230 | break |
231 | ;; | |
232 | -*) | |
233 | usage | |
234 | ;; | |
235 | *) | |
236 | break | |
237 | ;; | |
238 | esac | |
239 | shift | |
240 | done | |
241 | ||
b0169d84 CB |
242 | prompt_after_failed_merge() { |
243 | while true; do | |
244 | printf "Continue merging other unresolved paths (y/n) ? " | |
245 | read ans | |
246 | case "$ans" in | |
247 | ||
248 | [yY]*) | |
249 | return 0 | |
250 | ;; | |
251 | ||
252 | [nN]*) | |
253 | return 1 | |
254 | ;; | |
255 | esac | |
256 | done | |
257 | } | |
e3fa2c76 | 258 | |
47d65924 DA |
259 | if test -z "$merge_tool"; then |
260 | merge_tool=$(get_merge_tool "$merge_tool") || exit | |
261 | fi | |
70af4e9b | 262 | merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)" |
21d0ba7e | 263 | merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)" |
c4b4a5af | 264 | |
b0169d84 CB |
265 | last_status=0 |
266 | rollup_status=0 | |
c4b4a5af TT |
267 | |
268 | if test $# -eq 0 ; then | |
9a62d72d | 269 | files=$(git ls-files -u | sed -e 's/^[^ ]* //' | sort -u) |
0eea3451 CB |
270 | if test -z "$files" ; then |
271 | echo "No files need merging" | |
272 | exit 0 | |
273 | fi | |
274 | echo Merging the files: "$files" | |
275 | git ls-files -u | | |
276 | sed -e 's/^[^ ]* //' | | |
277 | sort -u | | |
278 | while IFS= read i | |
279 | do | |
b0169d84 CB |
280 | if test $last_status -ne 0; then |
281 | prompt_after_failed_merge < /dev/tty || exit 1 | |
c4b4a5af | 282 | fi |
0eea3451 CB |
283 | printf "\n" |
284 | merge_file "$i" < /dev/tty > /dev/tty | |
b0169d84 CB |
285 | last_status=$? |
286 | if test $last_status -ne 0; then | |
287 | rollup_status=1 | |
288 | fi | |
0eea3451 | 289 | done |
c4b4a5af | 290 | else |
0eea3451 | 291 | while test $# -gt 0; do |
b0169d84 CB |
292 | if test $last_status -ne 0; then |
293 | prompt_after_failed_merge || exit 1 | |
294 | fi | |
0eea3451 CB |
295 | printf "\n" |
296 | merge_file "$1" | |
b0169d84 CB |
297 | last_status=$? |
298 | if test $last_status -ne 0; then | |
299 | rollup_status=1 | |
300 | fi | |
0eea3451 CB |
301 | shift |
302 | done | |
c4b4a5af | 303 | fi |
b0169d84 CB |
304 | |
305 | exit $rollup_status |