Gecko [ www.foryou-vip.com ]

Name	Size	Permission	Date
mergetools	[ DIR ]	drwxrwxrwx	2020-08-24 23:42
git	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-add	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-add--interactive	36.78 KB	-rwxrwxrwx	2020-04-20 04:07
git-am	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-annotate	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-apply	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-archive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-bisect	15.61 KB	-rwxrwxrwx	2020-04-20 04:07
git-bisect--helper	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-blame	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-branch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-bundle	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cat-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-attr	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-ignore	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-mailmap	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-ref-format	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-checkout	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-checkout-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cherry	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cherry-pick	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-clean	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-clone	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-column	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-commit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-commit-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-config	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-count-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-credential	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-credential-cache	1006.94 KB	-rwxrwxrwx	2020-04-20 04:07
git-credential-cache--daemon	1019 KB	-rwxrwxrwx	2020-04-20 04:07
git-credential-store	1018.97 KB	-rwxrwxrwx	2020-04-20 04:07
git-daemon	1023.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-describe	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-files	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-difftool	12.24 KB	-rwxrwxrwx	2020-04-20 04:07
git-difftool--helper	2.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-fast-export	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fast-import	1.02 MB	-rwxrwxrwx	2020-04-20 04:07
git-fetch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fetch-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-filter-branch	12.53 KB	-rwxrwxrwx	2020-04-20 04:07
git-fmt-merge-msg	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-for-each-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-format-patch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fsck	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fsck-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-gc	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-get-tar-commit-id	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-grep	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-hash-object	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-help	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-http-backend	1019.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-http-fetch	1.1 MB	-rwxrwxrwx	2020-04-20 04:07
git-http-push	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-imap-send	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-index-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-init	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-init-db	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-instaweb	18.11 KB	-rwxrwxrwx	2020-04-20 04:07
git-interpret-trailers	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-log	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-files	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-remote	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mailinfo	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mailsplit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-base	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-octopus	2.42 KB	-rwxrwxrwx	2020-04-20 04:07
git-merge-one-file	3.62 KB	-rwxrwxrwx	2020-04-20 04:07
git-merge-ours	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-recursive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-resolve	944 B	-rwxrwxrwx	2020-04-20 04:07
git-merge-subtree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mergetool	9.76 KB	-rwxrwxrwx	2020-04-20 04:07
git-mergetool--lib	7.79 KB	-rwxrwxrwx	2020-04-20 04:07
git-mktag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mktree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mv	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-name-rev	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-notes	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-redundant	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-refs	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-parse-remote	2.59 KB	-rwxrwxrwx	2020-04-20 04:07
git-patch-id	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-prune	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-prune-packed	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pull	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-push	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-quiltimport	3.51 KB	-rwxrwxrwx	2020-04-20 04:07
git-read-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rebase	15.75 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--am	2.41 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--interactive	34.47 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--merge	3.84 KB	-rwxrwxrwx	2020-04-20 04:07
git-receive-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-reflog	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-relink	4.1 KB	-rwxrwxrwx	2020-04-20 04:07
git-remote	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ext	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-fd	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ftp	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ftps	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-http	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-https	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-testsvn	1.01 MB	-rwxrwxrwx	2020-04-20 04:07
git-repack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-replace	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-request-pull	3.77 KB	-rwxrwxrwx	2020-04-20 04:07
git-rerere	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-reset	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rev-list	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rev-parse	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-revert	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rm	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-send-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-sh-i18n	2.3 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-i18n--envsubst	1006.86 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-prompt	15.73 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-setup	9.03 KB	-rwxrwxrwx	2020-04-20 04:07
git-shell	1006.97 KB	-rwxrwxrwx	2020-04-20 04:07
git-shortlog	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show-branch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show-index	1006.86 KB	-rwxrwxrwx	2020-04-20 04:07
git-show-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stage	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stash	13.9 KB	-rwxrwxrwx	2020-04-20 04:07
git-status	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stripspace	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-submodule	27.18 KB	-rwxrwxrwx	2020-04-20 04:07
git-submodule--helper	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-subtree	16.02 KB	-rwxrwxrwx	2020-04-20 04:07
git-symbolic-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-tag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-unpack-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-unpack-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-server-info	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-upload-archive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-upload-pack	1.06 MB	-rwxrwxrwx	2020-04-20 04:07
git-var	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-commit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-tag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-web--browse	4.3 KB	-rwxrwxrwx	2020-04-20 04:07
git-whatchanged	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-worktree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-write-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07

Rename

#!/bin/sh
#
# Copyright (c) Linus Torvalds, 2005
#
# This is the git per-file merge script, called with
#
#   $1 - original file SHA1 (or empty)
#   $2 - file in branch1 SHA1 (or empty)
#   $3 - file in branch2 SHA1 (or empty)
#   $4 - pathname in repository
#   $5 - original file mode (or empty)
#   $6 - file in branch1 mode (or empty)
#   $7 - file in branch2 mode (or empty)
#
# Handle some trivial cases.. The _really_ trivial cases have
# been handled already by git read-tree, but that one doesn't
# do any merges that might change the tree layout.

USAGE='<orig blob> <our blob> <their blob> <path>'
USAGE="$USAGE <orig mode> <our mode> <their mode>"
LONG_USAGE="usage: git merge-one-file $USAGE

Blob ids and modes should be empty for missing files."

SUBDIRECTORY_OK=Yes
. git-sh-setup
cd_to_toplevel
require_work_tree

if test $# != 7
then
	echo "$LONG_USAGE"
	exit 1
fi

case "${1:-.}${2:-.}${3:-.}" in
#
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
	if { test -z "$6" && test "$5" != "$7"; } ||
	   { test -z "$7" && test "$5" != "$6"; }
	then
		echo "ERROR: File $4 deleted on one branch but had its" >&2
		echo "ERROR: permissions changed on the other." >&2
		exit 1
	fi

if test -n "$2"
	then
		echo "Removing $4"
	else
		# read-tree checked that index matches HEAD already,
		# so we know we do not have this path tracked.
		# there may be an unrelated working tree file here,
		# which we should just leave unmolested.  Make sure
		# we do not have it in the index, though.
		exec git update-index --remove -- "$4"
	fi
	if test -f "$4"
	then
		rm -f -- "$4" &&
		rmdir -p "$(expr "z$4" : 'z$.*$/')" 2>/dev/null || :
	fi &&
		exec git update-index --remove -- "$4"
	;;

#
# Added in one.
#
".$2.")
	# the other side did not add and we added so there is nothing
	# to be done, except making the path merged.
	exec git update-index --add --cacheinfo "$6" "$2" "$4"
	;;
"..$3")
	echo "Adding $4"
	if test -f "$4"
	then
		echo "ERROR: untracked $4 is overwritten by the merge." >&2
		exit 1
	fi
	git update-index --add --cacheinfo "$7" "$3" "$4" &&
		exec git checkout-index -u -f -- "$4"
	;;

#
# Added in both, identically (check for same permissions).
#
".$3$2")
	if test "$6" != "$7"
	then
		echo "ERROR: File $4 added identically in both branches," >&2
		echo "ERROR: but permissions conflict $6->$7." >&2
		exit 1
	fi
	echo "Adding $4"
	git update-index --add --cacheinfo "$6" "$2" "$4" &&
		exec git checkout-index -u -f -- "$4"
	;;

#
# Modified in both, but differently.
#
"$1$2$3" | ".$2$3")

case ",$6,$7," in
	*,120000,*)
		echo "ERROR: $4: Not merging symbolic link changes." >&2
		exit 1
		;;
	*,160000,*)
		echo "ERROR: $4: Not merging conflicting submodule changes." >&2
		exit 1
		;;
	esac

src1=$(git-unpack-file $2)
	src2=$(git-unpack-file $3)
	case "$1" in
	'')
		echo "Added $4 in both, but differently."
		orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
		;;
	*)
		echo "Auto-merging $4"
		orig=$(git-unpack-file $1)
		;;
	esac

git merge-file "$src1" "$orig" "$src2"
	ret=$?
	msg=
	if test $ret != 0 || test -z "$1"
	then
		msg='content conflict'
		ret=1
	fi

# Create the working tree file, using "our tree" version from the
	# index, and then store the result of the merge.
	git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1
	rm -f -- "$orig" "$src1" "$src2"

if test "$6" != "$7"
	then
		if test -n "$msg"
		then
			msg="$msg, "
		fi
		msg="${msg}permissions conflict: $5->$6,$7"
		ret=1
	fi

if test $ret != 0
	then
		echo "ERROR: $msg in $4" >&2
		exit 1
	fi
	exec git update-index -- "$4"
	;;

*)
	echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2
	;;
esac
exit 1