merge(3p/git): Merge git subtree at v2.29.2
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
This commit is contained in:
parent
082c006c04
commit
f4609b896f
1485 changed files with 241535 additions and 109418 deletions
1
third_party/git/t/t6130-pathspec-noglob.sh
vendored
1
third_party/git/t/t6130-pathspec-noglob.sh
vendored
|
|
@ -10,6 +10,7 @@ test_expect_success 'create commits with glob characters' '
|
|||
# the name "f*" in the worktree, because it is not allowed
|
||||
# on Windows (the tests below do not depend on the presence
|
||||
# of the file in the worktree)
|
||||
git config core.protectNTFS false &&
|
||||
git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
|
||||
test_tick &&
|
||||
git commit -m star &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue