File Manager

Hackfut Security File Manager

Current Path: /usr/libexec/git-core

📁 ..
📄 git(1.09 MB)
📄 git-add(1.09 MB)
📄 git-add--interactive(34.88 KB)
📄 git-am(18.59 KB)
📄 git-annotate(1.09 MB)
📄 git-apply(1.09 MB)
📄 git-archive(1.09 MB)
📄 git-bisect(9.79 KB)
📄 git-bisect--helper(1.09 MB)
📄 git-blame(1.09 MB)
📄 git-branch(1.09 MB)
📄 git-bundle(1.09 MB)
📄 git-cat-file(1.09 MB)
📄 git-check-attr(1.09 MB)
📄 git-check-ref-format(1.09 MB)
📄 git-checkout(1.09 MB)
📄 git-checkout-index(1.09 MB)
📄 git-cherry(1.09 MB)
📄 git-cherry-pick(1.09 MB)
📄 git-clean(1.09 MB)
📄 git-clone(1.09 MB)
📄 git-commit(1.09 MB)
📄 git-commit-tree(1.09 MB)
📄 git-config(1.09 MB)
📄 git-count-objects(1.09 MB)
📄 git-describe(1.09 MB)
📄 git-diff(1.09 MB)
📄 git-diff-files(1.09 MB)
📄 git-diff-index(1.09 MB)
📄 git-diff-tree(1.09 MB)
📄 git-difftool(2.63 KB)
📄 git-difftool--helper(1.7 KB)
📄 git-fast-export(1.09 MB)
📄 git-fast-import(486.72 KB)
📄 git-fetch(1.09 MB)
📄 git-fetch-pack(1.09 MB)
📄 git-filter-branch(11.89 KB)
📄 git-fmt-merge-msg(1.09 MB)
📄 git-for-each-ref(1.09 MB)
📄 git-format-patch(1.09 MB)
📄 git-fsck(1.09 MB)
📄 git-fsck-objects(1.09 MB)
📄 git-gc(1.09 MB)
📄 git-get-tar-commit-id(1.09 MB)
📄 git-grep(1.09 MB)
📄 git-hash-object(1.09 MB)
📄 git-help(1.09 MB)
📄 git-http-backend(454.97 KB)
📄 git-http-fetch(475.59 KB)
📄 git-http-push(490.94 KB)
📄 git-imap-send(471.97 KB)
📄 git-index-pack(1.09 MB)
📄 git-init(1.09 MB)
📄 git-init-db(1.09 MB)
📄 git-instaweb(242.57 KB)
📄 git-log(1.09 MB)
📄 git-lost-found(554 B)
📄 git-ls-files(1.09 MB)
📄 git-ls-remote(1.09 MB)
📄 git-ls-tree(1.09 MB)
📄 git-mailinfo(1.09 MB)
📄 git-mailsplit(1.09 MB)
📄 git-merge(1.09 MB)
📄 git-merge-base(1.09 MB)
📄 git-merge-file(1.09 MB)
📄 git-merge-index(1.09 MB)
📄 git-merge-octopus(2.02 KB)
📄 git-merge-one-file(3.72 KB)
📄 git-merge-ours(1.09 MB)
📄 git-merge-recursive(1.09 MB)
📄 git-merge-resolve(944 B)
📄 git-merge-subtree(1.09 MB)
📄 git-merge-tree(1.09 MB)
📄 git-mergetool(5.96 KB)
📄 git-mergetool--lib(8.79 KB)
📄 git-mktag(1.09 MB)
📄 git-mktree(1.09 MB)
📄 git-mv(1.09 MB)
📄 git-name-rev(1.09 MB)
📄 git-notes(1.09 MB)
📄 git-pack-objects(1.09 MB)
📄 git-pack-redundant(1.09 MB)
📄 git-pack-refs(1.09 MB)
📄 git-parse-remote(1.9 KB)
📄 git-patch-id(1.09 MB)
📄 git-peek-remote(1.09 MB)
📄 git-prune(1.09 MB)
📄 git-prune-packed(1.09 MB)
📄 git-pull(7.84 KB)
📄 git-push(1.09 MB)
📄 git-quiltimport(3.27 KB)
📄 git-read-tree(1.09 MB)
📄 git-rebase(14.3 KB)
📄 git-rebase--interactive(24.33 KB)
📄 git-receive-pack(1.09 MB)
📄 git-reflog(1.09 MB)
📄 git-relink(4.1 KB)
📄 git-remote(1.09 MB)
📄 git-remote-ftp(484.16 KB)
📄 git-remote-ftps(484.16 KB)
📄 git-remote-http(484.16 KB)
📄 git-remote-https(484.16 KB)
📄 git-repack(4.39 KB)
📄 git-replace(1.09 MB)
📄 git-repo-config(1.09 MB)
📄 git-request-pull(1.55 KB)
📄 git-rerere(1.09 MB)
📄 git-reset(1.09 MB)
📄 git-rev-list(1.09 MB)
📄 git-rev-parse(1.09 MB)
📄 git-revert(1.09 MB)
📄 git-rm(1.09 MB)
📄 git-send-pack(1.09 MB)
📄 git-sh-setup(3.92 KB)
📄 git-shell(446.8 KB)
📄 git-shortlog(1.09 MB)
📄 git-show(1.09 MB)
📄 git-show-branch(1.09 MB)
📄 git-show-index(10.62 KB)
📄 git-show-ref(1.09 MB)
📄 git-stage(1.09 MB)
📄 git-stash(8.63 KB)
📄 git-status(1.09 MB)
📄 git-stripspace(1.09 MB)
📄 git-submodule(17.36 KB)
📄 git-symbolic-ref(1.09 MB)
📄 git-tag(1.09 MB)
📄 git-tar-tree(1.09 MB)
📄 git-unpack-file(1.09 MB)
📄 git-unpack-objects(1.09 MB)
📄 git-update-index(1.09 MB)
📄 git-update-ref(1.09 MB)
📄 git-update-server-info(1.09 MB)
📄 git-upload-archive(1.09 MB)
📄 git-upload-pack(456.86 KB)
📄 git-var(1.09 MB)
📄 git-verify-pack(1.09 MB)
📄 git-verify-tag(1.09 MB)
📄 git-web--browse(3.87 KB)
📄 git-whatchanged(1.09 MB)
📄 git-write-tree(1.09 MB)

Editing: git-merge-one-file

#!/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."

if ! test "$#" -eq 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 [ "$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."
		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 [ "$6" != "$7" ]; then
		echo "ERROR: File $4 added identically in both branches,"
		echo "ERROR: but permissions conflict $6->$7."
		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."
		exit 1
		;;
	*,160000,*)
		echo "ERROR: $4: Not merging conflicting submodule changes."
		exit 1
		;;
	esac

src2=`git-unpack-file $3`
	case "$1" in
	'')
		echo "Added $4 in both, but differently."
		# This extracts OUR file in $orig, and uses git apply to
		# remove lines that are unique to ours.
		orig=`git-unpack-file $2`
		sz0=`wc -c <"$orig"`
		diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
		sz1=`wc -c <"$orig"`

# If we do not have enough common material, it is not
		# worth trying two-file merge using common subsections.
		expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
		;;
	*)
		echo "Auto-merging $4"
		orig=`git-unpack-file $1`
		;;
	esac

# Be careful for funny filename such as "-L" in "$4", which
	# would confuse "merge" greatly.
	src1=`git-unpack-file $2`
	git merge-file "$src1" "$orig" "$src2"
	ret=$?
	msg=
	if [ $ret -ne 0 ]; then
		msg='content conflict'
	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"
	rm -f -- "$orig" "$src1" "$src2"

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

if [ $ret -ne 0 ]; then
		echo "ERROR: $msg in $4"
		exit 1
	fi
	exec git update-index -- "$4"
	;;

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

Hackfut Security File Manager

Editing: git-merge-one-file

Upload File

Create Folder