Gecko [ goons4good.org ]

Name	Size	Permission	Date
mergetools	[ DIR ]	drwxr-xr-x	2023-02-07 05:24
git	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-add	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-add--interactive	46.68 KB	-rwxr-xr-x	2023-01-25 18:06
git-am	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-annotate	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-apply	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-archive	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-bisect	1.59 KB	-rwxr-xr-x	2023-01-25 18:06
git-bisect--helper	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-blame	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-branch	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-bugreport	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-bundle	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-cat-file	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-check-attr	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-check-ignore	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-check-mailmap	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-check-ref-format	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-checkout	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-checkout--worker	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-checkout-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-cherry	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-cherry-pick	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-clean	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-clone	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-column	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-commit	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-commit-graph	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-commit-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-config	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-contacts	4.4 KB	-rwxr-xr-x	2023-01-25 18:06
git-count-objects	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-credential	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-credential-cache	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-credential-cache--daemon	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-credential-netrc	10.69 KB	-rwxr-xr-x	2023-01-25 18:06
git-credential-store	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-describe	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-diagnose	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-diff	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-diff-files	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-diff-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-diff-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-difftool	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-difftool--helper	2.44 KB	-rwxr-xr-x	2023-01-25 18:06
git-env--helper	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fast-export	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fast-import	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fetch	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fetch-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-filter-branch	15.49 KB	-rwxr-xr-x	2023-01-25 18:06
git-fmt-merge-msg	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-for-each-ref	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-for-each-repo	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-format-patch	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fsck	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fsck-objects	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-fsmonitor--daemon	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-gc	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-get-tar-commit-id	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-grep	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-hash-object	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-help	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-hook	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-http-backend	2.04 MB	-rwxr-xr-x	2023-01-25 18:07
git-http-fetch	2.07 MB	-rwxr-xr-x	2023-01-25 18:07
git-http-push	2.08 MB	-rwxr-xr-x	2023-01-25 18:07
git-imap-send	2.05 MB	-rwxr-xr-x	2023-01-25 18:07
git-index-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-init	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-init-db	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-interpret-trailers	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-log	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-ls-files	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-ls-remote	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-ls-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-mailinfo	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-mailsplit	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-maintenance	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-base	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-file	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-octopus	2.42 KB	-rwxr-xr-x	2023-01-25 18:06
git-merge-one-file	3.61 KB	-rwxr-xr-x	2023-01-25 18:06
git-merge-ours	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-recursive	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-resolve	1.2 KB	-rwxr-xr-x	2023-01-25 18:06
git-merge-subtree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-merge-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-mergetool	11.29 KB	-rwxr-xr-x	2023-01-25 18:06
git-mergetool--lib	9.69 KB	-rw-r--r--	2023-01-25 18:06
git-mktag	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-mktree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-multi-pack-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-mv	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-name-rev	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-notes	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-pack-objects	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-pack-redundant	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-pack-refs	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-patch-id	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-prune	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-prune-packed	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-pull	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-push	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-quiltimport	3.61 KB	-rwxr-xr-x	2023-01-25 18:06
git-range-diff	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-read-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-rebase	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-receive-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-reflog	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-ext	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-fd	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-ftp	2.08 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-ftps	2.08 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-http	2.08 MB	-rwxr-xr-x	2023-01-25 18:07
git-remote-https	2.08 MB	-rwxr-xr-x	2023-01-25 18:07
git-repack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-replace	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-request-pull	4.03 KB	-rwxr-xr-x	2023-01-25 18:06
git-rerere	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-reset	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-restore	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-rev-list	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-rev-parse	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-revert	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-rm	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-send-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-sh-i18n	1.64 KB	-rw-r--r--	2023-01-25 18:06
git-sh-i18n--envsubst	2.03 MB	-rwxr-xr-x	2023-01-25 18:07
git-sh-setup	8.2 KB	-rw-r--r--	2023-01-25 18:06
git-shell	2.03 MB	-rwxr-xr-x	2023-01-25 18:07
git-shortlog	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-show	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-show-branch	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-show-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-show-ref	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-sparse-checkout	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-stage	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-stash	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-status	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-stripspace	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-submodule	10.23 KB	-rwxr-xr-x	2023-01-25 18:06
git-submodule--helper	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-switch	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-symbolic-ref	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-tag	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-unpack-file	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-unpack-objects	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-update-index	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-update-ref	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-update-server-info	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-upload-archive	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-upload-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-var	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-verify-commit	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-verify-pack	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-verify-tag	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-version	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-web--browse	4.3 KB	-rwxr-xr-x	2023-01-25 18:06
git-whatchanged	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-worktree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
git-write-tree	3.52 MB	-rwxr-xr-x	2023-01-25 18:07
scalar	2.08 MB	-rwxr-xr-x	2023-01-25 18: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 $(git hash-object /dev/null))
		;;
	*)
		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