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
11
third_party/git/t/t2022-checkout-paths.sh
vendored
11
third_party/git/t/t2022-checkout-paths.sh
vendored
|
|
@ -78,4 +78,15 @@ test_expect_success 'do not touch files that are already up-to-date' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' '
|
||||
echo "nonempty" >nonempty &&
|
||||
>empty &&
|
||||
git add nonempty empty &&
|
||||
git commit -m "create files to be deleted" &&
|
||||
git rm --cached nonempty empty &&
|
||||
git add -N nonempty empty &&
|
||||
git checkout HEAD nonempty empty &&
|
||||
git diff --cached --exit-code
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue