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 (6099B)

#!/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] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
require_work_tree

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

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

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

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

cleanup_temp_files () {
    if test "$1" = --save-backup ; then
	mv -- "$BACKUP" "$MERGED.orig"
	rm -f -- "$LOCAL" "$REMOTE" "$BASE"
    else
	rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
    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")'"
    else
	if base_present; then
	    echo "modified"
	else
	    echo "created"
	fi
    fi
}

resolve_symlink_merge () {
    while true; do
	printf "Use (l)ocal or (r)emote, or (a)bort? "
	read ans
	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
	case "$ans" in
	    [mMcC]*)
		git add -- "$MERGED"
		cleanup_temp_files --save-backup
		return 0
		;;
	    [dD]*)
		git rm -- "$MERGED" > /dev/null
		cleanup_temp_files
		return 0
		;;
	    [aA]*)
		return 1
		;;
	    esac
	done
}

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

if test $? -eq 0 -a -n "$tmpfile" ; then
	mv -- "$(git rev-parse --show-cdup)$tmpfile" "$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

ext="$$$(expr "$MERGED" : '.*$\.[^/]*$$')"
    BACKUP="./$MERGED.BACKUP.$ext"
    LOCAL="./$MERGED.LOCAL.$ext"
    REMOTE="./$MERGED.REMOTE.$ext"
    BASE="./$MERGED.BASE.$ext"

mv -- "$MERGED" "$BACKUP"
    cp -- "$BACKUP" "$MERGED"

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;}')

base_present   && checkout_staged_file 1 "$MERGED" "$BASE"
    local_present  && checkout_staged_file 2 "$MERGED" "$LOCAL"
    remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"

if test -z "$local_mode" -o -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
	return
    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 "$prompt" = true; then
	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
	read ans
    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 || echo true)

while test $# != 0
do
    case "$1" in
	-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
	case "$ans" in

[yY]*)
		return 0
		;;

[nN]*)
		return 1
		;;
	esac
    done
}

if test -z "$merge_tool"; then
    merge_tool=$(get_merge_tool "$merge_tool") || exit
fi
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"

last_status=0
rollup_status=0

if test $# -eq 0 ; then
    files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
    if test -z "$files" ; then
	echo "No files need merging"
	exit 0
    fi
    echo Merging the files: "$files"
    git ls-files -u |
    sed -e 's/^[^	]*	//' |
    sort -u |
    while IFS= read i
    do
	if test $last_status -ne 0; then
	    prompt_after_failed_merge < /dev/tty || exit 1
	fi
	printf "\n"
	merge_file "$i" < /dev/tty > /dev/tty
	last_status=$?
	if test $last_status -ne 0; then
	    rollup_status=1
	fi
    done
else
    while test $# -gt 0; do
	if test $last_status -ne 0; then
	    prompt_after_failed_merge || exit 1
	fi
	printf "\n"
	merge_file "$1"
	last_status=$?
	if test $last_status -ne 0; then
	    rollup_status=1
	fi
	shift
    done
fi

exit $rollup_status

cmd: