maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(3p/git): Merge git subtree at v2.29.2

Browse source 
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:
Vincent Ambo 2020-11-21 19:20:35 +01:00
parent 082c006c04
commit f4609b896f
1485 changed files with 241535 additions and 109418 deletions
Download patch file Download diff file Expand all files Collapse all files

37
third_party/git/t/t7519-status-fsmonitor.sh vendored
View file

@ -32,11 +32,12 @@ write_integration_script () {
echo "$0: exactly 2 arguments expected"
exit 2
fi
if test "$1" != 1
if test "$1" != 2
then
echo "Unsupported core.fsmonitor hook version." >&2
exit 1
fi
printf "last_update_token\0"
printf "untracked\0"
printf "dir1/untracked\0"
printf "dir2/untracked\0"
@ -106,6 +107,9 @@ EOF
# test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit
test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' '
write_script .git/hooks/fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
EOF
git update-index --fsmonitor &&
git update-index --fsmonitor-valid dir1/modified &&
git update-index --fsmonitor-valid dir2/modified &&
@ -164,6 +168,9 @@ EOF
# test that newly added files are marked valid
test_expect_success 'newly added files are marked valid' '
write_script .git/hooks/fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
EOF
git add new &&
git add dir1/new &&
git add dir2/new &&
@ -203,6 +210,7 @@ EOF
# test that *only* files returned by the integration script get flagged as invalid
test_expect_success '*only* files returned by the integration script get flagged as invalid' '
write_script .git/hooks/fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
printf "dir1/modified\0"
EOF
clean_repo &&
@ -218,11 +226,12 @@ test_expect_success '*only* files returned by the integration script get flagged
# Ensure commands that call refresh_index() to move the index back in time
# properly invalidate the fsmonitor cache
test_expect_success 'refresh_index() invalidates fsmonitor cache' '
write_script .git/hooks/fsmonitor-test<<-\EOF &&
EOF
clean_repo &&
dirty_repo &&
write_integration_script &&
git add . &&
write_script .git/hooks/fsmonitor-test<<-\EOF &&
EOF
git commit -m "to reset" &&
git reset HEAD~1 &&
git status >actual &&
@ -271,6 +280,7 @@ do
# (if enabled) files unless it is told about them.
test_expect_success "status doesn't detect unreported modifications" '
write_script .git/hooks/fsmonitor-test<<-\EOF &&
printf "last_update_token\0"
:>marker
EOF
clean_repo &&
@ -294,7 +304,7 @@ do
done
done
# test that splitting the index dosn't interfere
# test that splitting the index doesn't interfere
test_expect_success 'splitting the index results in the same state' '
write_integration_script &&
dirty_repo &&
@ -354,4 +364,23 @@ test_expect_success 'discard_index() also discards fsmonitor info' '
test_cmp expect actual
'
# Test unstaging entries that:
# - Are not flagged with CE_FSMONITOR_VALID
# - Have a position in the index >= the number of entries present in the index
# after unstaging.
test_expect_success 'status succeeds after staging/unstaging' '
test_create_repo fsmonitor-stage-unstage &&
(
cd fsmonitor-stage-unstage &&
test_commit initial &&
git update-index --fsmonitor &&
removed=$(test_seq 1 100 | sed "s/^/z/") &&
touch $removed &&
git add $removed &&
git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
FSMONITOR_LIST="$removed" git restore -S $removed &&
FSMONITOR_LIST="$removed" git status
)
'
test_done