merge(3p/git): Merge git subtree at v2.29.2 r/1890

This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because
there is some breakage in the git build related to the netrc
credentials helper which someone has taken care of in nixpkgs.

The stable channel is not used for anything other than git, so this
should be fine.

Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb

1 files changed, 0 insertions, 27 deletions

diff --git a/third_party/git/t/perf/p5600-clone-reference.sh b/third_party/git/t/perf/p5600-clone-reference.sh
deleted file mode 100755
index 68fed663479d..000000000000
--- a/third_party/git/t/perf/p5600-clone-reference.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-test_description='speed of clone --reference'
-. ./perf-lib.sh
-
-test_perf_default_repo
-
-test_expect_success 'create shareable repository' '
-	git clone --bare . shared.git
-'
-
-test_expect_success 'advance base repository' '
-	# Do not use test_commit here; its test_tick will
-	# use some ancient hard-coded date. The resulting clock
-	# skew will cause pack-objects to traverse in a very
-	# sub-optimal order, skewing the results.
-	echo content >new-file-that-does-not-exist &&
-	git add new-file-that-does-not-exist &&
-	git commit -m "new commit"
-'
-
-test_perf 'clone --reference' '
-	rm -rf dst.git &&
-	git clone --no-local --bare --reference shared.git . dst.git
-'
-
-test_done