3 # This program resolves merge conflicts in git
5 # Copyright (c) 2006 Theodore Y. Ts'o
7 # This file is licensed under the GPL v2, or a later version
8 # at the discretion of Junio C Hamano.
11 USAGE
='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...'
19 # Returns true if the mode reflects a symlink
33 test -n "$remote_mode"
40 cleanup_temp_files
() {
41 if test "$1" = --save-backup ; then
42 rm -rf -- "$MERGED.orig"
43 test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
44 rm -f -- "$LOCAL" "$REMOTE" "$BASE"
46 rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
55 printf " {%s}: " "$branch"
56 if test -z "$mode"; then
58 elif is_symlink
"$mode" ; then
59 echo "a symbolic link -> '$(cat "$file")'"
60 elif is_submodule
"$mode" ; then
61 echo "submodule commit $file"
72 resolve_symlink_merge
() {
74 printf "Use (l)ocal or (r)emote, or (a)bort? "
78 git checkout-index
-f --stage=2 -- "$MERGED"
80 cleanup_temp_files
--save-backup
84 git checkout-index
-f --stage=3 -- "$MERGED"
86 cleanup_temp_files
--save-backup
96 resolve_deleted_merge
() {
99 printf "Use (m)odified or (d)eleted file, or (a)bort? "
101 printf "Use (c)reated or (d)eleted file, or (a)bort? "
107 cleanup_temp_files
--save-backup
111 git
rm -- "$MERGED" > /dev
/null
122 resolve_submodule_merge
() {
124 printf "Use (l)ocal or (r)emote, or (a)bort? "
128 if ! local_present
; then
129 if test -n "$(git ls-tree HEAD -- "$MERGED")"; then
130 # Local isn't present, but it's a subdirectory
131 git ls-tree
--full-name -r HEAD
-- "$MERGED" | git update-index
--index-info ||
exit $?
133 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
134 git update-index
--force-remove "$MERGED"
135 cleanup_temp_files
--save-backup
137 elif is_submodule
"$local_mode"; then
138 stage_submodule
"$MERGED" "$local_sha1"
140 git checkout-index
-f --stage=2 -- "$MERGED"
146 if ! remote_present
; then
147 if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"; then
148 # Remote isn't present, but it's a subdirectory
149 git ls-tree
--full-name -r MERGE_HEAD
-- "$MERGED" | git update-index
--index-info ||
exit $?
151 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
152 git update-index
--force-remove "$MERGED"
154 elif is_submodule
"$remote_mode"; then
155 ! is_submodule
"$local_mode" && test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
156 stage_submodule
"$MERGED" "$remote_sha1"
158 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
159 git checkout-index
-f --stage=3 -- "$MERGED"
162 cleanup_temp_files
--save-backup
175 mkdir
-p "$path" || die
"fatal: unable to create directory for module at $path"
176 # Find $path relative to work tree
177 work_tree_root
=$
(cd_to_toplevel
&& pwd)
178 work_rel_path
=$
(cd "$path" && GIT_WORK_TREE
="${work_tree_root}" git rev-parse
--show-prefix)
179 test -n "$work_rel_path" || die
"fatal: unable to get path of module $path relative to work tree"
180 git update-index
--add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die
183 checkout_staged_file
() {
185 "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
188 if test $?
-eq 0 -a -n "$tmpfile" ; then
189 mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
198 f
=$
(git ls-files
-u -- "$MERGED")
199 if test -z "$f" ; then
200 if test ! -f "$MERGED" ; then
201 echo "$MERGED: file not found"
203 echo "$MERGED: file does not need merging"
208 ext
="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
209 BACKUP
="./$MERGED.BACKUP.$ext"
210 LOCAL
="./$MERGED.LOCAL.$ext"
211 REMOTE
="./$MERGED.REMOTE.$ext"
212 BASE
="./$MERGED.BASE.$ext"
214 base_mode
=$
(git ls-files
-u -- "$MERGED" |
awk '{if ($3==1) print $1;}')
215 local_mode
=$
(git ls-files
-u -- "$MERGED" |
awk '{if ($3==2) print $1;}')
216 remote_mode
=$
(git ls-files
-u -- "$MERGED" |
awk '{if ($3==3) print $1;}')
218 if is_submodule
"$local_mode" || is_submodule
"$remote_mode"; then
219 echo "Submodule merge conflict for '$MERGED':"
220 local_sha1
=$
(git ls-files
-u -- "$MERGED" |
awk '{if ($3==2) print $2;}')
221 remote_sha1
=$
(git ls-files
-u -- "$MERGED" |
awk '{if ($3==3) print $2;}')
222 describe_file
"$local_mode" "local" "$local_sha1"
223 describe_file
"$remote_mode" "remote" "$remote_sha1"
224 resolve_submodule_merge
228 mv -- "$MERGED" "$BACKUP"
229 cp -- "$BACKUP" "$MERGED"
231 checkout_staged_file
1 "$MERGED" "$BASE"
232 checkout_staged_file
2 "$MERGED" "$LOCAL"
233 checkout_staged_file
3 "$MERGED" "$REMOTE"
235 if test -z "$local_mode" -o -z "$remote_mode"; then
236 echo "Deleted merge conflict for '$MERGED':"
237 describe_file
"$local_mode" "local" "$LOCAL"
238 describe_file
"$remote_mode" "remote" "$REMOTE"
239 resolve_deleted_merge
243 if is_symlink
"$local_mode" || is_symlink
"$remote_mode"; then
244 echo "Symbolic link merge conflict for '$MERGED':"
245 describe_file
"$local_mode" "local" "$LOCAL"
246 describe_file
"$remote_mode" "remote" "$REMOTE"
247 resolve_symlink_merge
251 echo "Normal merge conflict for '$MERGED':"
252 describe_file
"$local_mode" "local" "$LOCAL"
253 describe_file
"$remote_mode" "remote" "$REMOTE"
254 if "$prompt" = true
; then
255 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
259 if base_present
; then
265 if ! run_merge_tool
"$merge_tool" "$present"; then
266 echo "merge of $MERGED failed" 1>&2
267 mv -- "$BACKUP" "$MERGED"
269 if test "$merge_keep_temporaries" = "false"; then
276 if test "$merge_keep_backup" = "true"; then
277 mv -- "$BACKUP" "$MERGED.orig"
287 prompt
=$
(git config
--bool mergetool.prompt ||
echo true
)
295 merge_tool
=$
(expr "z$1" : 'z-[^=]*=\(.*\)')
324 prompt_after_failed_merge
() {
326 printf "Continue merging other unresolved paths (y/n) ? "
341 if test -z "$merge_tool"; then
342 merge_tool
=$
(get_merge_tool
"$merge_tool") ||
exit
344 merge_keep_backup
="$(git config --bool mergetool.keepBackup || echo true)"
345 merge_keep_temporaries
="$(git config --bool mergetool.keepTemporaries || echo false)"
351 if test $# -eq 0 ; then
354 if test -e "$GIT_DIR/MERGE_RR"
356 files
=$
(git rerere remaining
)
358 files
=$
(git ls-files
-u |
sed -e 's/^[^ ]* //' |
sort -u)
361 files
=$
(git ls-files
-u -- "$@" |
sed -e 's/^[^ ]* //' |
sort -u)
364 if test -z "$files" ; then
365 echo "No files need merging"
376 if test $last_status -ne 0; then
377 prompt_after_failed_merge ||
exit 1
382 if test $last_status -ne 0; then