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

#!/bin/sh
#
# This program resolves merge conflicts in git
#
# Copyright (c) 2006 Theodore Y. Ts'o
# Copyright (c) 2009-2016 David Aguilar
#
# 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] [-g|--gui|--no-gui] [-O<orderfile>] [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_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
}

print_noop_and_exit () {
	echo "No files need merging"
	exit 0
}

main () {
	prompt=$(git config --bool mergetool.prompt)
	gui_tool=false
	guessed_merge_tool=false
	orderfile=

	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
			;;
		--no-gui)
			gui_tool=false
			;;
		-g|--gui)
			gui_tool=true
			;;
		-y|--no-prompt)
			prompt=false
			;;
		--prompt)
			prompt=true
			;;
		-O*)
			orderfile="${1#-O}"
			;;
		--)
			shift
			break
			;;
		-*)
			usage
			;;
		*)
			break
			;;
		esac
		shift
	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 $gui_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)"

	prefix=$(git rev-parse --show-prefix) || exit 1
	cd_to_toplevel

	if test -n "$orderfile"
	then
		orderfile=$(
			git rev-parse --prefix "$prefix" -- "$orderfile" |
			sed -e 1d
		)
	fi

	if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
	then
		set -- $(git rerere remaining)
		if test $# -eq 0
		then
			print_noop_and_exit
		fi
	elif test $# -ge 0
	then
		# rev-parse provides the -- needed for 'set'
		eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
	fi

	files=$(git -c core.quotePath=false \
		diff --name-only --diff-filter=U \
		${orderfile:+"-O$orderfile"} -- "$@")

	if test -z "$files"
	then
		print_noop_and_exit
	fi

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

	rc=0
	set -- $files
	while test $# -ne 0
	do
		printf "\n"
		if ! merge_file "$1"
		then
			rc=1
			test $# -ne 1 && prompt_after_failed_merge || exit 1
		fi
		shift
	done

	exit $rc
}

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