merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
4
third_party/git/t/t3700-add.sh
vendored
4
third_party/git/t/t3700-add.sh
vendored
|
|
@ -326,7 +326,9 @@ test_expect_success 'git add --dry-run of an existing file output' "
|
|||
cat >expect.err <<\EOF
|
||||
The following paths are ignored by one of your .gitignore files:
|
||||
ignored-file
|
||||
Use -f if you really want to add them.
|
||||
hint: Use -f if you really want to add them.
|
||||
hint: Turn this message off by running
|
||||
hint: "git config advice.addIgnoredFile false"
|
||||
EOF
|
||||
cat >expect.out <<\EOF
|
||||
add 'track-this'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue