chore(3p/git): Unvendor git and track patches instead r/2903

This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b

23 files changed, 0 insertions, 537 deletions

diff --git a/third_party/git/mergetools/araxis b/third_party/git/mergetools/araxis
deleted file mode 100644
index e2407b65b70d..000000000000
--- a/third_party/git/mergetools/araxis
+++ /dev/null
@@ -1,18 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
-}
-
-merge_cmd () {
-	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
-}
-
-translate_merge_tool_path() {
-	echo compare
-}
diff --git a/third_party/git/mergetools/bc b/third_party/git/mergetools/bc
deleted file mode 100644
index a89086ee720f..000000000000
--- a/third_party/git/mergetools/bc
+++ /dev/null
@@ -1,28 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-			-mergeoutput="$MERGED"
-	else
-		"$merge_tool_path" "$LOCAL" "$REMOTE" \
-			-mergeoutput="$MERGED"
-	fi
-}
-
-translate_merge_tool_path() {
-	if type bcomp >/dev/null 2>/dev/null
-	then
-		echo bcomp
-	else
-		echo bcompare
-	fi
-}
-
-list_tool_variants () {
-	echo bc
-	echo bc3
-}
diff --git a/third_party/git/mergetools/codecompare b/third_party/git/mergetools/codecompare
deleted file mode 100644
index 9f60e8da6527..000000000000
--- a/third_party/git/mergetools/codecompare
+++ /dev/null
@@ -1,23 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
-			-RF="$MERGED"
-	else
-		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
-			-RF="$MERGED"
-	fi
-}
-
-translate_merge_tool_path() {
-	if merge_mode
-	then
-		echo CodeMerge
-	else
-		echo CodeCompare
-	fi
-}
diff --git a/third_party/git/mergetools/deltawalker b/third_party/git/mergetools/deltawalker
deleted file mode 100644
index ee6f374bceb8..000000000000
--- a/third_party/git/mergetools/deltawalker
+++ /dev/null
@@ -1,25 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
-}
-
-merge_cmd () {
-	# Adding $(pwd)/ in front of $MERGED should not be necessary.
-	# However without it, DeltaWalker (at least v1.9.8 on Windows)
-	# crashes with a JRE exception.  The DeltaWalker user manual,
-	# shows $(pwd)/ whenever the '-merged' options is given.
-	# Adding it here seems to work around the problem.
-	if $base_present
-	then
-		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
-	else
-		"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
-	fi >/dev/null 2>&1
-}
-
-translate_merge_tool_path () {
-	echo DeltaWalker
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/diffmerge b/third_party/git/mergetools/diffmerge
deleted file mode 100644
index 9b6355b98a71..000000000000
--- a/third_party/git/mergetools/diffmerge
+++ /dev/null
@@ -1,18 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" --merge --result="$MERGED" \
-			"$LOCAL" "$BASE" "$REMOTE"
-	else
-		"$merge_tool_path" --merge \
-			--result="$MERGED" "$LOCAL" "$REMOTE"
-	fi
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/diffuse b/third_party/git/mergetools/diffuse
deleted file mode 100644
index 5a3ae8b5695d..000000000000
--- a/third_party/git/mergetools/diffuse
+++ /dev/null
@@ -1,15 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" \
-			"$LOCAL" "$MERGED" "$REMOTE" \
-			"$BASE" | cat
-	else
-		"$merge_tool_path" \
-			"$LOCAL" "$MERGED" "$REMOTE" | cat
-	fi
-}
diff --git a/third_party/git/mergetools/ecmerge b/third_party/git/mergetools/ecmerge
deleted file mode 100644
index 6c5101c4f729..000000000000
--- a/third_party/git/mergetools/ecmerge
+++ /dev/null
@@ -1,14 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	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
-}
diff --git a/third_party/git/mergetools/emerge b/third_party/git/mergetools/emerge
deleted file mode 100644
index d1ce513ff5d3..000000000000
--- a/third_party/git/mergetools/emerge
+++ /dev/null
@@ -1,26 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	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
-}
-
-translate_merge_tool_path() {
-	echo emacs
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/examdiff b/third_party/git/mergetools/examdiff
deleted file mode 100644
index e72b06fc4d8f..000000000000
--- a/third_party/git/mergetools/examdiff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
-	else
-		"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
-	fi
-}
-
-translate_merge_tool_path() {
-	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
-}
diff --git a/third_party/git/mergetools/guiffy b/third_party/git/mergetools/guiffy
deleted file mode 100644
index 8b23a13c4111..000000000000
--- a/third_party/git/mergetools/guiffy
+++ /dev/null
@@ -1,18 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" -s "$LOCAL" \
-		"$REMOTE" "$BASE" "$MERGED"
-	else
-		"$merge_tool_path" -m "$LOCAL" \
-		"$REMOTE" "$MERGED"
-	fi
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/gvimdiff b/third_party/git/mergetools/gvimdiff
deleted file mode 100644
index 04a5bb0ea848..000000000000
--- a/third_party/git/mergetools/gvimdiff
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/third_party/git/mergetools/kdiff3 b/third_party/git/mergetools/kdiff3
deleted file mode 100644
index 0264ed5b20b2..000000000000
--- a/third_party/git/mergetools/kdiff3
+++ /dev/null
@@ -1,27 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" \
-		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
-		"$LOCAL" "$REMOTE" >/dev/null 2>&1
-}
-
-merge_cmd () {
-	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
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/kompare b/third_party/git/mergetools/kompare
deleted file mode 100644
index e8c0bfa67854..000000000000
--- a/third_party/git/mergetools/kompare
+++ /dev/null
@@ -1,11 +0,0 @@
-can_merge () {
-	return 1
-}
-
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/meld b/third_party/git/mergetools/meld
deleted file mode 100644
index aab4ebb9355a..000000000000
--- a/third_party/git/mergetools/meld
+++ /dev/null
@@ -1,89 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	check_meld_for_features
-
-	option_auto_merge=
-	if test "$meld_use_auto_merge_option" = true
-	then
-		option_auto_merge="--auto-merge"
-	fi
-
-	if test "$meld_has_output_option" = true
-	then
-		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
-			"$LOCAL" "$BASE" "$REMOTE"
-	else
-		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
-	fi
-}
-
-# Get meld help message
-init_meld_help_msg () {
-	if test -z "$meld_help_msg"
-	then
-		meld_path="$(git config mergetool.meld.path || echo meld)"
-		meld_help_msg=$("$meld_path" --help 2>&1)
-	fi
-}
-
-# Check the features and set flags
-check_meld_for_features () {
-	# Check whether we should use 'meld --output <file>'
-	if test -z "$meld_has_output_option"
-	then
-		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
-		case "$meld_has_output_option" in
-		true | false)
-			: use configured value
-			;;
-		*)
-			: empty or invalid configured value, detecting "--output" automatically
-			init_meld_help_msg
-
-			case "$meld_help_msg" in
-			*"--output="* | *'[OPTION...]'*)
-				# All version that has [OPTION...] supports --output
-				meld_has_output_option=true
-				;;
-			*)
-				meld_has_output_option=false
-				;;
-			esac
-			;;
-		esac
-	fi
-	# Check whether we should use 'meld --auto-merge ...'
-	if test -z "$meld_use_auto_merge_option"
-	then
-		meld_use_auto_merge_option=$(
-			git config --bool-or-str mergetool.meld.useAutoMerge
-		)
-		case "$meld_use_auto_merge_option" in
-		true | false)
-			: use well formatted boolean value
-			;;
-		auto)
-			# testing the "--auto-merge" option only if config is "auto"
-			init_meld_help_msg
-
-			case "$meld_help_msg" in
-			*"--auto-merge"* | *'[OPTION...]'*)
-				meld_use_auto_merge_option=true
-				;;
-			*)
-				meld_use_auto_merge_option=false
-				;;
-			esac
-			;;
-		"")
-			meld_use_auto_merge_option=false
-			;;
-		*)
-			die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option"
-			;;
-		esac
-	fi
-}
diff --git a/third_party/git/mergetools/nvimdiff b/third_party/git/mergetools/nvimdiff
deleted file mode 100644
index 04a5bb0ea848..000000000000
--- a/third_party/git/mergetools/nvimdiff
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/third_party/git/mergetools/opendiff b/third_party/git/mergetools/opendiff
deleted file mode 100644
index b608dd6de30a..000000000000
--- a/third_party/git/mergetools/opendiff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" "$LOCAL" "$REMOTE" \
-			-ancestor "$BASE" -merge "$MERGED" | cat
-	else
-		"$merge_tool_path" "$LOCAL" "$REMOTE" \
-			-merge "$MERGED" | cat
-	fi
-}
diff --git a/third_party/git/mergetools/p4merge b/third_party/git/mergetools/p4merge
deleted file mode 100644
index 7a5b291dd28a..000000000000
--- a/third_party/git/mergetools/p4merge
+++ /dev/null
@@ -1,36 +0,0 @@
-diff_cmd () {
-	empty_file=
-
-	# p4merge does not like /dev/null
-	if test "/dev/null" = "$LOCAL"
-	then
-		LOCAL="$(create_empty_file)"
-	fi
-	if test "/dev/null" = "$REMOTE"
-	then
-		REMOTE="$(create_empty_file)"
-	fi
-
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-
-	if test -n "$empty_file"
-	then
-		rm -f "$empty_file"
-	fi
-}
-
-merge_cmd () {
-	if ! $base_present
-	then
-		cp -- "$LOCAL" "$BASE"
-		create_virtual_base "$BASE" "$REMOTE"
-	fi
-	"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
-}
-
-create_empty_file () {
-	empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
-	>"$empty_file"
-
-	printf "%s" "$empty_file"
-}
diff --git a/third_party/git/mergetools/smerge b/third_party/git/mergetools/smerge
deleted file mode 100644
index 9c2e6f6fd7d0..000000000000
--- a/third_party/git/mergetools/smerge
+++ /dev/null
@@ -1,12 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
-	else
-		"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
-	fi
-}
diff --git a/third_party/git/mergetools/tkdiff b/third_party/git/mergetools/tkdiff
deleted file mode 100644
index eee5cb57e3cc..000000000000
--- a/third_party/git/mergetools/tkdiff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
-	else
-		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
-	fi
-}
-
-exit_code_trustable () {
-	true
-}
diff --git a/third_party/git/mergetools/tortoisemerge b/third_party/git/mergetools/tortoisemerge
deleted file mode 100644
index d7ab666a59a2..000000000000
--- a/third_party/git/mergetools/tortoisemerge
+++ /dev/null
@@ -1,32 +0,0 @@
-can_diff () {
-	return 1
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		basename="$(basename "$merge_tool_path" .exe)"
-		if test "$basename" = "tortoisegitmerge"
-		then
-			"$merge_tool_path" \
-				-base "$BASE" -mine "$LOCAL" \
-				-theirs "$REMOTE" -merged "$MERGED"
-		else
-			"$merge_tool_path" \
-				-base:"$BASE" -mine:"$LOCAL" \
-				-theirs:"$REMOTE" -merged:"$MERGED"
-		fi
-	else
-		echo "$merge_tool_path cannot be used without a base" 1>&2
-		return 1
-	fi
-}
-
-translate_merge_tool_path() {
-	if type tortoisegitmerge >/dev/null 2>/dev/null
-	then
-		echo tortoisegitmerge
-	else
-		echo tortoisemerge
-	fi
-}
diff --git a/third_party/git/mergetools/vimdiff b/third_party/git/mergetools/vimdiff
deleted file mode 100644
index abc8ce4ec44e..000000000000
--- a/third_party/git/mergetools/vimdiff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" -R -f -d \
-		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	case "$1" in
-	*vimdiff)
-		if $base_present
-		then
-			"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
-				"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
-		else
-			"$merge_tool_path" -f -d -c 'wincmd l' \
-				"$LOCAL" "$MERGED" "$REMOTE"
-		fi
-		;;
-	*vimdiff2)
-		"$merge_tool_path" -f -d -c 'wincmd l' \
-			"$LOCAL" "$MERGED" "$REMOTE"
-		;;
-	*vimdiff3)
-		if $base_present
-		then
-			"$merge_tool_path" -f -d -c 'hid | hid | hid' \
-				"$LOCAL" "$REMOTE" "$BASE" "$MERGED"
-		else
-			"$merge_tool_path" -f -d -c 'hid | hid' \
-				"$LOCAL" "$REMOTE" "$MERGED"
-		fi
-		;;
-	esac
-}
-
-translate_merge_tool_path() {
-	case "$1" in
-	nvimdiff*)
-		echo nvim
-		;;
-	gvimdiff*)
-		echo gvim
-		;;
-	vimdiff*)
-		echo vim
-		;;
-	esac
-}
-
-exit_code_trustable () {
-	true
-}
-
-list_tool_variants () {
-	for prefix in '' g n; do
-		for suffix in '' 2 3; do
-			echo "${prefix}vimdiff${suffix}"
-		done
-	done
-}
diff --git a/third_party/git/mergetools/winmerge b/third_party/git/mergetools/winmerge
deleted file mode 100644
index 74d03259fdf1..000000000000
--- a/third_party/git/mergetools/winmerge
+++ /dev/null
@@ -1,15 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
-	return 0
-}
-
-merge_cmd () {
-	# mergetool.winmerge.trustExitCode is implicitly false.
-	# touch $BACKUP so that we can check_unchanged.
-	"$merge_tool_path" -u -e -dl Local -dr Remote \
-		"$LOCAL" "$REMOTE" "$MERGED"
-}
-
-translate_merge_tool_path() {
-	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
-}
diff --git a/third_party/git/mergetools/xxdiff b/third_party/git/mergetools/xxdiff
deleted file mode 100644
index ce5b8e9f2962..000000000000
--- a/third_party/git/mergetools/xxdiff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" \
-		-R 'Accel.Search: "Ctrl+F"' \
-		-R 'Accel.SearchForward: "Ctrl+G"' \
-		"$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	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
-}