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, 77 deletions

diff --git a/third_party/git/t/t5580-clone-push-unc.sh b/third_party/git/t/t5580-clone-push-unc.sh
deleted file mode 100755
index b3c8a92450bc..000000000000
--- a/third_party/git/t/t5580-clone-push-unc.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-test_description='various Windows-only path tests'
-. ./test-lib.sh
-
-if test_have_prereq CYGWIN
-then
-	alias winpwd='cygpath -aw .'
-elif test_have_prereq MINGW
-then
-	alias winpwd=pwd
-else
-	skip_all='skipping Windows-only path tests'
-	test_done
-fi
-
-UNCPATH="$(winpwd)"
-case "$UNCPATH" in
-[A-Z]:*)
-	# Use administrative share e.g. \\localhost\C$\git-sdk-64\usr\src\git
-	# (we use forward slashes here because MSYS2 and Git accept them, and
-	# they are easier on the eyes)
-	UNCPATH="//localhost/${UNCPATH%%:*}\$/${UNCPATH#?:}"
-	test -d "$UNCPATH" || {
-		skip_all='could not access administrative share; skipping'
-		test_done
-	}
-	;;
-*)
-	skip_all='skipping UNC path tests, cannot determine current path as UNC'
-	test_done
-	;;
-esac
-
-test_expect_success setup '
-	test_commit initial
-'
-
-test_expect_success clone '
-	git clone "file://$UNCPATH" clone
-'
-
-test_expect_success 'clone with backslashed path' '
-	BACKSLASHED="$(echo "$UNCPATH" | tr / \\\\)" &&
-	git clone "$BACKSLASHED" backslashed
-'
-
-test_expect_success push '
-	(
-		cd clone &&
-		git checkout -b to-push &&
-		test_commit to-push &&
-		git push origin HEAD
-	) &&
-	rev="$(git -C clone rev-parse --verify refs/heads/to-push)" &&
-	test "$rev" = "$(git rev-parse --verify refs/heads/to-push)"
-'
-
-test_expect_success MINGW 'remote nick cannot contain backslashes' '
-	BACKSLASHED="$(winpwd | tr / \\\\)" &&
-	git ls-remote "$BACKSLASHED" >out 2>err &&
-	test_i18ngrep ! "unable to access" err
-'
-
-test_expect_success 'unc alternates' '
-	tree="$(git rev-parse HEAD:)" &&
-	mkdir test-unc-alternate &&
-	(
-		cd test-unc-alternate &&
-		git init &&
-		test_must_fail git show $tree &&
-		echo "$UNCPATH/.git/objects" >.git/objects/info/alternates &&
-		git show $tree
-	)
-'
-
-test_done