FM / git-core

/usr/libexec/git-core

Name	Size	Mode	Actions
git	1139544	0755	edit dl rm
git-add	1139544	0755	edit dl rm
git-add--interactive	35716	0755	edit dl rm
git-am	19036	0755	edit dl rm
git-annotate	1139544	0755	edit dl rm
git-apply	1139544	0755	edit dl rm
git-archive	1139544	0755	edit dl rm
git-bisect	10021	0755	edit dl rm
git-bisect--helper	1139544	0755	edit dl rm
git-blame	1139544	0755	edit dl rm
git-branch	1139544	0755	edit dl rm
git-bundle	1139544	0755	edit dl rm
git-cat-file	1139544	0755	edit dl rm
git-check-attr	1139544	0755	edit dl rm
git-check-ref-format	1139544	0755	edit dl rm
git-checkout	1139544	0755	edit dl rm
git-checkout-index	1139544	0755	edit dl rm
git-cherry	1139544	0755	edit dl rm
git-cherry-pick	1139544	0755	edit dl rm
git-clean	1139544	0755	edit dl rm
git-clone	1139544	0755	edit dl rm
git-commit	1139544	0755	edit dl rm
git-commit-tree	1139544	0755	edit dl rm
git-config	1139544	0755	edit dl rm
git-count-objects	1139544	0755	edit dl rm
git-describe	1139544	0755	edit dl rm
git-diff	1139544	0755	edit dl rm
git-diff-files	1139544	0755	edit dl rm
git-diff-index	1139544	0755	edit dl rm
git-diff-tree	1139544	0755	edit dl rm
git-difftool	2696	0755	edit dl rm
git-difftool--helper	1745	0755	edit dl rm
git-fast-export	1139544	0755	edit dl rm
git-fast-import	501632	0755	edit dl rm
git-fetch	1139544	0755	edit dl rm
git-fetch-pack	1139544	0755	edit dl rm
git-filter-branch	12172	0755	edit dl rm
git-fmt-merge-msg	1139544	0755	edit dl rm
git-for-each-ref	1139544	0755	edit dl rm
git-format-patch	1139544	0755	edit dl rm
git-fsck	1139544	0755	edit dl rm
git-fsck-objects	1139544	0755	edit dl rm
git-gc	1139544	0755	edit dl rm
git-get-tar-commit-id	1139544	0755	edit dl rm
git-grep	1139544	0755	edit dl rm
git-hash-object	1139544	0755	edit dl rm
git-help	1139544	0755	edit dl rm
git-http-backend	469088	0755	edit dl rm
git-http-fetch	490432	0755	edit dl rm
git-http-push	506560	0755	edit dl rm
git-imap-send	486656	0755	edit dl rm
git-index-pack	1139544	0755	edit dl rm
git-init	1139544	0755	edit dl rm
git-init-db	1139544	0755	edit dl rm
git-instaweb	248389	0755	edit dl rm
git-log	1139544	0755	edit dl rm
git-lost-found	554	0755	edit dl rm
git-ls-files	1139544	0755	edit dl rm
git-ls-remote	1139544	0755	edit dl rm
git-ls-tree	1139544	0755	edit dl rm
git-mailinfo	1139544	0755	edit dl rm
git-mailsplit	1139544	0755	edit dl rm
git-merge	1139544	0755	edit dl rm
git-merge-base	1139544	0755	edit dl rm
git-merge-file	1139544	0755	edit dl rm
git-merge-index	1139544	0755	edit dl rm
git-merge-octopus	2068	0755	edit dl rm
git-merge-one-file	3814	0755	edit dl rm
git-merge-ours	1139544	0755	edit dl rm
git-merge-recursive	1139544	0755	edit dl rm
git-merge-resolve	944	0755	edit dl rm
git-merge-subtree	1139544	0755	edit dl rm
git-merge-tree	1139544	0755	edit dl rm
git-mergetool	6099	0755	edit dl rm
git-mergetool--lib	9006	0644	edit dl rm
git-mktag	1139544	0755	edit dl rm
git-mktree	1139544	0755	edit dl rm
git-mv	1139544	0755	edit dl rm
git-name-rev	1139544	0755	edit dl rm
git-notes	1139544	0755	edit dl rm
git-pack-objects	1139544	0755	edit dl rm
git-pack-redundant	1139544	0755	edit dl rm
git-pack-refs	1139544	0755	edit dl rm
git-parse-remote	1941	0644	edit dl rm
git-patch-id	1139544	0755	edit dl rm
git-peek-remote	1139544	0755	edit dl rm
git-prune	1139544	0755	edit dl rm
git-prune-packed	1139544	0755	edit dl rm
git-pull	8027	0755	edit dl rm
git-push	1139544	0755	edit dl rm
git-quiltimport	3348	0755	edit dl rm
git-read-tree	1139544	0755	edit dl rm
git-rebase	14646	0755	edit dl rm
git-rebase--interactive	24915	0755	edit dl rm
git-receive-pack	1139544	0755	edit dl rm
git-reflog	1139544	0755	edit dl rm
git-relink	4201	0755	edit dl rm
git-remote	1139544	0755	edit dl rm
git-remote-ftp	499168	0755	edit dl rm
git-remote-ftps	499168	0755	edit dl rm
git-remote-http	499168	0755	edit dl rm
git-remote-https	499168	0755	edit dl rm
git-repack	4492	0755	edit dl rm
git-replace	1139544	0755	edit dl rm
git-repo-config	1139544	0755	edit dl rm
git-request-pull	1592	0755	edit dl rm
git-rerere	1139544	0755	edit dl rm
git-reset	1139544	0755	edit dl rm
git-rev-list	1139544	0755	edit dl rm
git-rev-parse	1139544	0755	edit dl rm
git-revert	1139544	0755	edit dl rm
git-rm	1139544	0755	edit dl rm
git-send-pack	1139544	0755	edit dl rm
git-sh-setup	4013	0644	edit dl rm
git-shell	461304	0755	edit dl rm
git-shortlog	1139544	0755	edit dl rm
git-show	1139544	0755	edit dl rm
git-show-branch	1139544	0755	edit dl rm
git-show-index	10872	0755	edit dl rm
git-show-ref	1139544	0755	edit dl rm
git-stage	1139544	0755	edit dl rm
git-stash	8838	0755	edit dl rm
git-status	1139544	0755	edit dl rm
git-stripspace	1139544	0755	edit dl rm
git-submodule	17784	0755	edit dl rm
git-symbolic-ref	1139544	0755	edit dl rm
git-tag	1139544	0755	edit dl rm
git-tar-tree	1139544	0755	edit dl rm
git-unpack-file	1139544	0755	edit dl rm
git-unpack-objects	1139544	0755	edit dl rm
git-update-index	1139544	0755	edit dl rm
git-update-ref	1139544	0755	edit dl rm
git-update-server-info	1139544	0755	edit dl rm
git-upload-archive	1139544	0755	edit dl rm
git-upload-pack	471216	0755	edit dl rm
git-var	1139544	0755	edit dl rm
git-verify-pack	1139544	0755	edit dl rm
git-verify-tag	1139544	0755	edit dl rm
git-web--browse	3961	0755	edit dl rm
git-whatchanged	1139544	0755	edit dl rm
git-write-tree	1139544	0755	edit dl rm

Edit: /usr/libexec/git-core/git-mergetool--lib (9006B)

#!/bin/sh
# git-mergetool--lib is a library for common merge tool functions
diff_mode() {
	test "$TOOL_MODE" = diff
}

merge_mode() {
	test "$TOOL_MODE" = merge
}

translate_merge_tool_path () {
	case "$1" in
	vimdiff)
		echo vim
		;;
	gvimdiff)
		echo gvim
		;;
	emerge)
		echo emacs
		;;
	araxis)
		echo compare
		;;
	*)
		echo "$1"
		;;
	esac
}

check_unchanged () {
	if test "$MERGED" -nt "$BACKUP"; then
		status=0
	else
		while true; do
			echo "$MERGED seems unchanged."
			printf "Was the merge successful? [y/n] "
			read answer < /dev/tty
			case "$answer" in
			y*|Y*) status=0; break ;;
			n*|N*) status=1; break ;;
			esac
		done
	fi
}

valid_tool () {
	case "$1" in
	kdiff3 | tkdiff | xxdiff | meld | opendiff | \
	emerge | vimdiff | gvimdiff | ecmerge | diffuse | araxis | p4merge)
		;; # happy
	tortoisemerge)
		if ! merge_mode; then
			return 1
		fi
		;;
	kompare)
		if ! diff_mode; then
			return 1
		fi
		;;
	*)
		if test -z "$(get_merge_tool_cmd "$1")"; then
			return 1
		fi
		;;
	esac
}

get_merge_tool_cmd () {
	# Prints the custom command for a merge tool
	if test -n "$1"; then
		merge_tool="$1"
	else
		merge_tool="$(get_merge_tool)"
	fi
	if diff_mode; then
		echo "$(git config difftool.$merge_tool.cmd ||
		        git config mergetool.$merge_tool.cmd)"
	else
		echo "$(git config mergetool.$merge_tool.cmd)"
	fi
}

run_merge_tool () {
	merge_tool_path="$(get_merge_tool_path "$1")" || exit
	base_present="$2"
	status=0

case "$1" in
	kdiff3)
		if merge_mode; then
			if $base_present; then
				("$merge_tool_path" --auto \
					--L1 "$MERGED (Base)" \
					--L2 "$MERGED (Local)" \
					--L3 "$MERGED (Remote)" \
					-o "$MERGED" \
					"$BASE" "$LOCAL" "$REMOTE" \
				> /dev/null 2>&1)
			else
				("$merge_tool_path" --auto \
					--L1 "$MERGED (Local)" \
					--L2 "$MERGED (Remote)" \
					-o "$MERGED" \
					"$LOCAL" "$REMOTE" \
				> /dev/null 2>&1)
			fi
			status=$?
		else
			("$merge_tool_path" --auto \
				--L1 "$MERGED (A)" \
				--L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \
			> /dev/null 2>&1)
		fi
		;;
	kompare)
		"$merge_tool_path" "$LOCAL" "$REMOTE"
		;;
	tkdiff)
		if merge_mode; then
			if $base_present; then
				"$merge_tool_path" -a "$BASE" \
					-o "$MERGED" "$LOCAL" "$REMOTE"
			else
				"$merge_tool_path" \
					-o "$MERGED" "$LOCAL" "$REMOTE"
			fi
			status=$?
		else
			"$merge_tool_path" "$LOCAL" "$REMOTE"
		fi
		;;
	p4merge)
		if merge_mode; then
		    touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
			else
				"$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
			fi
			check_unchanged
		else
			"$merge_tool_path" "$LOCAL" "$REMOTE"
		fi
		;;
	meld)
		if merge_mode; then
			touch "$BACKUP"
			"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
			check_unchanged
		else
			"$merge_tool_path" "$LOCAL" "$REMOTE"
		fi
		;;
	diffuse)
		if merge_mode; then
			touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" \
					"$LOCAL" "$MERGED" "$REMOTE" \
					"$BASE" | cat
			else
				"$merge_tool_path" \
					"$LOCAL" "$MERGED" "$REMOTE" | cat
			fi
			check_unchanged
		else
			"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
		fi
		;;
	vimdiff)
		if merge_mode; then
			touch "$BACKUP"
			"$merge_tool_path" -d -c "wincmd l" \
				"$LOCAL" "$MERGED" "$REMOTE"
			check_unchanged
		else
			"$merge_tool_path" -d -c "wincmd l" \
				"$LOCAL" "$REMOTE"
		fi
		;;
	gvimdiff)
		if merge_mode; then
			touch "$BACKUP"
			"$merge_tool_path" -d -c "wincmd l" -f \
				"$LOCAL" "$MERGED" "$REMOTE"
			check_unchanged
		else
			"$merge_tool_path" -d -c "wincmd l" -f \
				"$LOCAL" "$REMOTE"
		fi
		;;
	xxdiff)
		if merge_mode; then
			touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" -X --show-merged-pane \
					-R 'Accel.SaveAsMerged: "Ctrl-S"' \
					-R 'Accel.Search: "Ctrl+F"' \
					-R 'Accel.SearchForward: "Ctrl-G"' \
					--merged-file "$MERGED" \
					"$LOCAL" "$BASE" "$REMOTE"
			else
				"$merge_tool_path" -X $extra \
					-R 'Accel.SaveAsMerged: "Ctrl-S"' \
					-R 'Accel.Search: "Ctrl+F"' \
					-R 'Accel.SearchForward: "Ctrl-G"' \
					--merged-file "$MERGED" \
					"$LOCAL" "$REMOTE"
			fi
			check_unchanged
		else
			"$merge_tool_path" \
				-R 'Accel.Search: "Ctrl+F"' \
				-R 'Accel.SearchForward: "Ctrl-G"' \
				"$LOCAL" "$REMOTE"
		fi
		;;
	opendiff)
		if merge_mode; then
			touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" "$LOCAL" "$REMOTE" \
					-ancestor "$BASE" \
					-merge "$MERGED" | cat
			else
				"$merge_tool_path" "$LOCAL" "$REMOTE" \
					-merge "$MERGED" | cat
			fi
			check_unchanged
		else
			"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
		fi
		;;
	ecmerge)
		if merge_mode; then
			touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
					--default --mode=merge3 --to="$MERGED"
			else
				"$merge_tool_path" "$LOCAL" "$REMOTE" \
					--default --mode=merge2 --to="$MERGED"
			fi
			check_unchanged
		else
			"$merge_tool_path" --default --mode=diff2 \
				"$LOCAL" "$REMOTE"
		fi
		;;
	emerge)
		if merge_mode; then
			if $base_present; then
				"$merge_tool_path" \
					-f emerge-files-with-ancestor-command \
					"$LOCAL" "$REMOTE" "$BASE" \
					"$(basename "$MERGED")"
			else
				"$merge_tool_path" \
					-f emerge-files-command \
					"$LOCAL" "$REMOTE" \
					"$(basename "$MERGED")"
			fi
			status=$?
		else
			"$merge_tool_path" -f emerge-files-command \
				"$LOCAL" "$REMOTE"
		fi
		;;
	tortoisemerge)
		if $base_present; then
			touch "$BACKUP"
			"$merge_tool_path" \
				-base:"$BASE" -mine:"$LOCAL" \
				-theirs:"$REMOTE" -merged:"$MERGED"
			check_unchanged
		else
			echo "TortoiseMerge cannot be used without a base" 1>&2
			status=1
		fi
		;;
	araxis)
		if merge_mode; then
			touch "$BACKUP"
			if $base_present; then
				"$merge_tool_path" -wait -merge -3 -a1 \
					"$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
					>/dev/null 2>&1
			else
				"$merge_tool_path" -wait -2 \
					"$LOCAL" "$REMOTE" "$MERGED" \
					>/dev/null 2>&1
			fi
			check_unchanged
		else
			"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
				>/dev/null 2>&1
		fi
		;;
	*)
		merge_tool_cmd="$(get_merge_tool_cmd "$1")"
		if test -z "$merge_tool_cmd"; then
			if merge_mode; then
				status=1
			fi
			break
		fi
		if merge_mode; then
			trust_exit_code="$(git config --bool \
				mergetool."$1".trustExitCode || echo false)"
			if test "$trust_exit_code" = "false"; then
				touch "$BACKUP"
				( eval $merge_tool_cmd )
				check_unchanged
			else
				( eval $merge_tool_cmd )
				status=$?
			fi
		else
			( eval $merge_tool_cmd )
		fi
		;;
	esac
	return $status
}

guess_merge_tool () {
	if merge_mode; then
		tools="tortoisemerge"
	else
		tools="kompare"
	fi
	if test -n "$DISPLAY"; then
		if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
			tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
		else
			tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
		fi
		tools="$tools gvimdiff diffuse ecmerge p4merge araxis"
	fi
	case "${VISUAL:-$EDITOR}" in
	*vim*)
		tools="$tools vimdiff emerge"
		;;
	*)
		tools="$tools emerge vimdiff"
		;;
	esac
	echo >&2 "merge tool candidates: $tools"

# Loop over each candidate and stop when a valid merge tool is found.
	for i in $tools
	do
		merge_tool_path="$(translate_merge_tool_path "$i")"
		if type "$merge_tool_path" > /dev/null 2>&1; then
			echo "$i"
			return 0
		fi
	done

echo >&2 "No known merge resolution program available."
	return 1
}

get_configured_merge_tool () {
	# Diff mode first tries diff.tool and falls back to merge.tool.
	# Merge mode only checks merge.tool
	if diff_mode; then
		merge_tool=$(git config diff.tool || git config merge.tool)
	else
		merge_tool=$(git config merge.tool)
	fi
	if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
		echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
		echo >&2 "Resetting to default..."
		return 1
	fi
	echo "$merge_tool"
}

get_merge_tool_path () {
	# A merge tool has been set, so verify that it's valid.
	if test -n "$1"; then
		merge_tool="$1"
	else
		merge_tool="$(get_merge_tool)"
	fi
	if ! valid_tool "$merge_tool"; then
		echo >&2 "Unknown merge tool $merge_tool"
		exit 1
	fi
	if diff_mode; then
		merge_tool_path=$(git config difftool."$merge_tool".path ||
		                  git config mergetool."$merge_tool".path)
	else
		merge_tool_path=$(git config mergetool."$merge_tool".path)
	fi
	if test -z "$merge_tool_path"; then
		merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
	fi
	if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
	! type "$merge_tool_path" > /dev/null 2>&1; then
		echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
		         "'$merge_tool_path'"
		exit 1
	fi
	echo "$merge_tool_path"
}

get_merge_tool () {
	# 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
	fi
	echo "$merge_tool"
}

#!/bin/sh # git-mergetool--lib is a library for common merge tool functions diff_mode() { test "$TOOL_MODE" = diff } merge_mode() { test "$TOOL_MODE" = merge } translate_merge_tool_path () { case "$1" in vimdiff) echo vim ;; gvimdiff) echo gvim ;; emerge) echo emacs ;; araxis) echo compare ;; *) echo "$1" ;; esac } check_unchanged () { if test "$MERGED" -nt "$BACKUP"; then status=0 else while true; do echo "$MERGED seems unchanged." printf "Was the merge successful? [y/n] " read answer < /dev/tty case "$answer" in y*|Y*) status=0; break ;; n*|N*) status=1; break ;; esac done fi } valid_tool () { case "$1" in kdiff3 | tkdiff | xxdiff | meld | opendiff | \ emerge | vimdiff | gvimdiff | ecmerge | diffuse | araxis | p4merge) ;; # happy tortoisemerge) if ! merge_mode; then return 1 fi ;; kompare) if ! diff_mode; then return 1 fi ;; *) if test -z "$(get_merge_tool_cmd "$1")"; then return 1 fi ;; esac } get_merge_tool_cmd () { # Prints the custom command for a merge tool if test -n "$1"; then merge_tool="$1" else merge_tool="$(get_merge_tool)" fi if diff_mode; then echo "$(git config difftool.$merge_tool.cmd || git config mergetool.$merge_tool.cmd)" else echo "$(git config mergetool.$merge_tool.cmd)" fi } run_merge_tool () { merge_tool_path="$(get_merge_tool_path "$1")" || exit base_present="$2" status=0 case "$1" in kdiff3) if merge_mode; then if $base_present; then ("$merge_tool_path" --auto \ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ -o "$MERGED" \ "$BASE" "$LOCAL" "$REMOTE" \ > /dev/null 2>&1) else ("$merge_tool_path" --auto \ --L1 "$MERGED (Local)" \ --L2 "$MERGED (Remote)" \ -o "$MERGED" \ "$LOCAL" "$REMOTE" \ > /dev/null 2>&1) fi status=$? else ("$merge_tool_path" --auto \ --L1 "$MERGED (A)" \ --L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \ > /dev/null 2>&1) fi ;; kompare) "$merge_tool_path" "$LOCAL" "$REMOTE" ;; tkdiff) if merge_mode; then if $base_present; then "$merge_tool_path" -a "$BASE" \ -o "$MERGED" "$LOCAL" "$REMOTE" else "$merge_tool_path" \ -o "$MERGED" "$LOCAL" "$REMOTE" fi status=$? else "$merge_tool_path" "$LOCAL" "$REMOTE" fi ;; p4merge) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" else "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED" fi check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" fi ;; meld) if merge_mode; then touch "$BACKUP" "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" fi ;; diffuse) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" | cat fi ;; vimdiff) if merge_mode; then touch "$BACKUP" "$merge_tool_path" -d -c "wincmd l" \ "$LOCAL" "$MERGED" "$REMOTE" check_unchanged else "$merge_tool_path" -d -c "wincmd l" \ "$LOCAL" "$REMOTE" fi ;; gvimdiff) if merge_mode; then touch "$BACKUP" "$merge_tool_path" -d -c "wincmd l" -f \ "$LOCAL" "$MERGED" "$REMOTE" check_unchanged else "$merge_tool_path" -d -c "wincmd l" -f \ "$LOCAL" "$REMOTE" fi ;; xxdiff) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" -X $extra \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" \ "$LOCAL" "$REMOTE" fi check_unchanged else "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ "$LOCAL" "$REMOTE" fi ;; opendiff) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" "$LOCAL" "$REMOTE" \ -ancestor "$BASE" \ -merge "$MERGED" | cat else "$merge_tool_path" "$LOCAL" "$REMOTE" \ -merge "$MERGED" | cat fi check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" | cat fi ;; ecmerge) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ --default --mode=merge3 --to="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ --default --mode=merge2 --to="$MERGED" fi check_unchanged else "$merge_tool_path" --default --mode=diff2 \ "$LOCAL" "$REMOTE" fi ;; emerge) if merge_mode; then if $base_present; then "$merge_tool_path" \ -f emerge-files-with-ancestor-command \ "$LOCAL" "$REMOTE" "$BASE" \ "$(basename "$MERGED")" else "$merge_tool_path" \ -f emerge-files-command \ "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi status=$? else "$merge_tool_path" -f emerge-files-command \ "$LOCAL" "$REMOTE" fi ;; tortoisemerge) if $base_present; then touch "$BACKUP" "$merge_tool_path" \ -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" check_unchanged else echo "TortoiseMerge cannot be used without a base" 1>&2 status=1 fi ;; araxis) if merge_mode; then touch "$BACKUP" if $base_present; then "$merge_tool_path" -wait -merge -3 -a1 \ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" \ >/dev/null 2>&1 else "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" \ >/dev/null 2>&1 fi check_unchanged else "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi ;; *) merge_tool_cmd="$(get_merge_tool_cmd "$1")" if test -z "$merge_tool_cmd"; then if merge_mode; then status=1 fi break fi if merge_mode; then trust_exit_code="$(git config --bool \ mergetool."$1".trustExitCode || echo false)" if test "$trust_exit_code" = "false"; then touch "$BACKUP" ( eval $merge_tool_cmd ) check_unchanged else ( eval $merge_tool_cmd ) status=$? fi else ( eval $merge_tool_cmd ) fi ;; esac return $status } guess_merge_tool () { if merge_mode; then tools="tortoisemerge" else tools="kompare" fi if test -n "$DISPLAY"; then if test -n "$GNOME_DESKTOP_SESSION_ID" ; then tools="meld opendiff kdiff3 tkdiff xxdiff $tools" else tools="opendiff kdiff3 tkdiff xxdiff meld $tools" fi tools="$tools gvimdiff diffuse ecmerge p4merge araxis" fi case "${VISUAL:-$EDITOR}" in *vim*) tools="$tools vimdiff emerge" ;; *) tools="$tools emerge vimdiff" ;; esac echo >&2 "merge tool candidates: $tools" # Loop over each candidate and stop when a valid merge tool is found. for i in $tools do merge_tool_path="$(translate_merge_tool_path "$i")" if type "$merge_tool_path" > /dev/null 2>&1; then echo "$i" return 0 fi done echo >&2 "No known merge resolution program available." return 1 } get_configured_merge_tool () { # Diff mode first tries diff.tool and falls back to merge.tool. # Merge mode only checks merge.tool if diff_mode; then merge_tool=$(git config diff.tool || git config merge.tool) else merge_tool=$(git config merge.tool) fi if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool" echo >&2 "Resetting to default..." return 1 fi echo "$merge_tool" } get_merge_tool_path () { # A merge tool has been set, so verify that it's valid. if test -n "$1"; then merge_tool="$1" else merge_tool="$(get_merge_tool)" fi if ! valid_tool "$merge_tool"; then echo >&2 "Unknown merge tool $merge_tool" exit 1 fi if diff_mode; then merge_tool_path=$(git config difftool."$merge_tool".path || git config mergetool."$merge_tool".path) else merge_tool_path=$(git config mergetool."$merge_tool".path) fi if test -z "$merge_tool_path"; then merge_tool_path="$(translate_merge_tool_path "$merge_tool")" fi if test -z "$(get_merge_tool_cmd "$merge_tool")" && ! type "$merge_tool_path" > /dev/null 2>&1; then echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\ "'$merge_tool_path'" exit 1 fi echo "$merge_tool_path" } get_merge_tool () { # 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 fi echo "$merge_tool" }