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-mergetool--lib

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

Hackfut Security File Manager

Editing: git-mergetool--lib

Upload File

Create Folder