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
2
third_party/git/t/t4213-log-tabexpand.sh
vendored
2
third_party/git/t/t4213-log-tabexpand.sh
vendored
|
|
@ -36,7 +36,7 @@ count_expand ()
|
|||
esac
|
||||
|
||||
# Prefix the output with the command line arguments, and
|
||||
# replace SP with a dot both in the expecte and actual output
|
||||
# replace SP with a dot both in the expected and actual output
|
||||
# so that test_cmp would show the difference together with the
|
||||
# breakage in a way easier to consume by the debugging user.
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue