[thirdparty/git.git] / git-mergetool.sh

#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Junio C Hamano.
#

USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
NONGIT_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib

# Returns true if the mode reflects a symlink
is_symlink () {
	test "$1" = 120000
}

is_submodule () {
	test "$1" = 160000
}

local_present () {
	test -n "$local_mode"
}

remote_present () {
	test -n "$remote_mode"
}

base_present () {
	test -n "$base_mode"
}

mergetool_tmpdir_init () {
	if test "$(git config --bool mergetool.writeToTemp)" != true
	then
		MERGETOOL_TMPDIR=.
		return 0
	fi
	if MERGETOOL_TMPDIR=$(mktemp -d -t "git-mergetool-XXXXXX" 2>/dev/null)
	then
		return 0
	fi
	die "error: mktemp is needed when 'mergetool.writeToTemp' is true"
}

cleanup_temp_files () {
	if test "$1" = --save-backup
	then
		rm -rf -- "$MERGED.orig"
		test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
		rm -f -- "$LOCAL" "$REMOTE" "$BASE"
	else
		rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
	fi
	if test "$MERGETOOL_TMPDIR" != "."
	then
		rmdir "$MERGETOOL_TMPDIR"
	fi
}

describe_file () {
	mode="$1"
	branch="$2"
	file="$3"

	printf "  {%s}: " "$branch"
	if test -z "$mode"
	then
		echo "deleted"
	elif is_symlink "$mode"
	then
		echo "a symbolic link -> '$(cat "$file")'"
	elif is_submodule "$mode"
	then
		echo "submodule commit $file"
	elif base_present
	then
		echo "modified file"
	else
		echo "created file"
	fi
}

resolve_symlink_merge () {
	while true
	do
		printf "Use (l)ocal or (r)emote, or (a)bort? "
		read ans || return 1
		case "$ans" in
		[lL]*)
			git checkout-index -f --stage=2 -- "$MERGED"
			git add -- "$MERGED"
			cleanup_temp_files --save-backup
			return 0
			;;
		[rR]*)
			git checkout-index -f --stage=3 -- "$MERGED"
			git add -- "$MERGED"
			cleanup_temp_files --save-backup
			return 0
			;;
		[aA]*)
			return 1
			;;
		esac
	done
}

resolve_deleted_merge () {
	while true
	do
		if base_present
		then
			printf "Use (m)odified or (d)eleted file, or (a)bort? "
		else
			printf "Use (c)reated or (d)eleted file, or (a)bort? "
		fi
		read ans || return 1
		case "$ans" in
		[mMcC]*)
			git add -- "$MERGED"
			if test "$merge_keep_backup" = "true"
			then
				cleanup_temp_files --save-backup
			else
				cleanup_temp_files
			fi
			return 0
			;;
		[dD]*)
			git rm -- "$MERGED" > /dev/null
			cleanup_temp_files
			return 0
			;;
		[aA]*)
			if test "$merge_keep_temporaries" = "false"
			then
				cleanup_temp_files
			fi
			return 1
			;;
		esac
	done
}

resolve_submodule_merge () {
	while true
	do
		printf "Use (l)ocal or (r)emote, or (a)bort? "
		read ans || return 1
		case "$ans" in
		[lL]*)
			if ! local_present
			then
				if test -n "$(git ls-tree HEAD -- "$MERGED")"
				then
					# Local isn't present, but it's a subdirectory
					git ls-tree --full-name -r HEAD -- "$MERGED" |
					git update-index --index-info || exit $?
				else
					test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
					git update-index --force-remove "$MERGED"
					cleanup_temp_files --save-backup
				fi
			elif is_submodule "$local_mode"
			then
				stage_submodule "$MERGED" "$local_sha1"
			else
				git checkout-index -f --stage=2 -- "$MERGED"
				git add -- "$MERGED"
			fi
			return 0
			;;
		[rR]*)
			if ! remote_present
			then
				if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"
				then
					# Remote isn't present, but it's a subdirectory
					git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" |
					git update-index --index-info || exit $?
				else
					test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
					git update-index --force-remove "$MERGED"
				fi
			elif is_submodule "$remote_mode"
			then
				! is_submodule "$local_mode" &&
				test -e "$MERGED" &&
				mv -- "$MERGED" "$BACKUP"
				stage_submodule "$MERGED" "$remote_sha1"
			else
				test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
				git checkout-index -f --stage=3 -- "$MERGED"
				git add -- "$MERGED"
			fi
			cleanup_temp_files --save-backup
			return 0
			;;
		[aA]*)
			return 1
			;;
		esac
	done
}

stage_submodule () {
	path="$1"
	submodule_sha1="$2"
	mkdir -p "$path" ||
	die "fatal: unable to create directory for module at $path"
	# Find $path relative to work tree
	work_tree_root=$(cd_to_toplevel && pwd)
	work_rel_path=$(cd "$path" &&
		GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix
	)
	test -n "$work_rel_path" ||
	die "fatal: unable to get path of module $path relative to work tree"
	git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die
}

checkout_staged_file () {
	tmpfile=$(expr \
		"$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
		: '\([^	]*\)	')

	if test $? -eq 0 && test -n "$tmpfile"
	then
		mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
	else
		>"$3"
	fi
}

merge_file () {
	MERGED="$1"

	f=$(git ls-files -u -- "$MERGED")
	if test -z "$f"
	then
		if test ! -f "$MERGED"
		then
			echo "$MERGED: file not found"
		else
			echo "$MERGED: file does not need merging"
		fi
		return 1
	fi

	if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$')
	then
		ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$')
	else
		BASE=$MERGED
		ext=
	fi

	mergetool_tmpdir_init

	if test "$MERGETOOL_TMPDIR" != "."
	then
		# If we're using a temporary directory then write to the
		# top-level of that directory.
		BASE=${BASE##*/}
	fi

	BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
	LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
	REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
	BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"

	base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
	local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
	remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')

	if is_submodule "$local_mode" || is_submodule "$remote_mode"
	then
		echo "Submodule merge conflict for '$MERGED':"
		local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
		remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
		describe_file "$local_mode" "local" "$local_sha1"
		describe_file "$remote_mode" "remote" "$remote_sha1"
		resolve_submodule_merge
		return
	fi

	if test -f "$MERGED"
	then
		mv -- "$MERGED" "$BACKUP"
		cp -- "$BACKUP" "$MERGED"
	fi
	# Create a parent directory to handle delete/delete conflicts
	# where the base's directory no longer exists.
	mkdir -p "$(dirname "$MERGED")"

	checkout_staged_file 1 "$MERGED" "$BASE"
	checkout_staged_file 2 "$MERGED" "$LOCAL"
	checkout_staged_file 3 "$MERGED" "$REMOTE"

	if test -z "$local_mode" || test -z "$remote_mode"
	then
		echo "Deleted merge conflict for '$MERGED':"
		describe_file "$local_mode" "local" "$LOCAL"
		describe_file "$remote_mode" "remote" "$REMOTE"
		resolve_deleted_merge
		status=$?
		rmdir -p "$(dirname "$MERGED")" 2>/dev/null
		return $status
	fi

	if is_symlink "$local_mode" || is_symlink "$remote_mode"
	then
		echo "Symbolic link merge conflict for '$MERGED':"
		describe_file "$local_mode" "local" "$LOCAL"
		describe_file "$remote_mode" "remote" "$REMOTE"
		resolve_symlink_merge
		return
	fi

	echo "Normal merge conflict for '$MERGED':"
	describe_file "$local_mode" "local" "$LOCAL"
	describe_file "$remote_mode" "remote" "$REMOTE"
	if test "$guessed_merge_tool" = true || test "$prompt" = true
	then
		printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
		read ans || return 1
	fi

	if base_present
	then
		present=true
	else
		present=false
	fi

	if ! run_merge_tool "$merge_tool" "$present"
	then
		echo "merge of $MERGED failed" 1>&2
		mv -- "$BACKUP" "$MERGED"

		if test "$merge_keep_temporaries" = "false"
		then
			cleanup_temp_files
		fi

		return 1
	fi

	if test "$merge_keep_backup" = "true"
	then
		mv -- "$BACKUP" "$MERGED.orig"
	else
		rm -- "$BACKUP"
	fi

	git add -- "$MERGED"
	cleanup_temp_files
	return 0
}

prompt=$(git config --bool mergetool.prompt)
guessed_merge_tool=false

while test $# != 0
do
	case "$1" in
	--tool-help=*)
		TOOL_MODE=${1#--tool-help=}
		show_tool_help
		;;
	--tool-help)
		show_tool_help
		;;
	-t|--tool*)
		case "$#,$1" in
		*,*=*)
			merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)')
			;;
		1,*)
			usage ;;
		*)
			merge_tool="$2"
			shift ;;
		esac
		;;
	-y|--no-prompt)
		prompt=false
		;;
	--prompt)
		prompt=true
		;;
	--)
		shift
		break
		;;
	-*)
		usage
		;;
	*)
		break
		;;
	esac
	shift
done

prompt_after_failed_merge () {
	while true
	do
		printf "Continue merging other unresolved paths [y/n]? "
		read ans || return 1
		case "$ans" in
		[yY]*)
			return 0
			;;
		[nN]*)
			return 1
			;;
		esac
	done
}

git_dir_init
require_work_tree

if test -z "$merge_tool"
then
	# Check if a merge tool has been configured
	merge_tool=$(get_configured_merge_tool)
	# Try to guess an appropriate merge tool if no tool has been set.
	if test -z "$merge_tool"
	then
		merge_tool=$(guess_merge_tool) || exit
		guessed_merge_tool=true
	fi
fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"

files=

if test $# -eq 0
then
	cd_to_toplevel

	if test -e "$GIT_DIR/MERGE_RR"
	then
		files=$(git rerere remaining)
	else
		files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
	fi
else
	files=$(git ls-files -u -- "$@" | sed -e 's/^[^	]*	//' | sort -u)
fi

if test -z "$files"
then
	echo "No files need merging"
	exit 0
fi

printf "Merging:\n"
printf "%s\n" "$files"

rc=0
for i in $files
do
	printf "\n"
	if ! merge_file "$i"
	then
		rc=1
		prompt_after_failed_merge || exit 1
	fi
done

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