-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
"git update-index --refresh" has been taught to deal better with racy timestamps (just like "git status" already does). * ms/update-index-racy: update-index: refresh should rewrite index in case of racy timestamps t7508: add tests capturing racy timestamp handling t7508: fix bogus mtime verification test-lib: introduce API for verifying file mtime
- Loading branch information
Showing
6 changed files
with
135 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#!/bin/sh | ||
|
||
test_description='update-index refresh tests related to racy timestamps' | ||
|
||
TEST_PASSES_SANITIZE_LEAK=true | ||
. ./test-lib.sh | ||
|
||
reset_files () { | ||
echo content >file && | ||
echo content >other && | ||
test_set_magic_mtime file && | ||
test_set_magic_mtime other | ||
} | ||
|
||
update_assert_changed () { | ||
test_set_magic_mtime .git/index && | ||
test_might_fail git update-index "$1" && | ||
! test_is_magic_mtime .git/index | ||
} | ||
|
||
test_expect_success 'setup' ' | ||
reset_files && | ||
# we are calling reset_files() a couple of times during tests; | ||
# test-tool chmtime does not change the ctime; to not weaken | ||
# or even break our tests, disable ctime-checks entirely | ||
git config core.trustctime false && | ||
git add file other && | ||
git commit -m "initial import" | ||
' | ||
|
||
test_expect_success '--refresh has no racy timestamps to fix' ' | ||
reset_files && | ||
# set the index time far enough to the future; | ||
# it must be at least 3 seconds for VFAT | ||
test_set_magic_mtime .git/index +60 && | ||
git update-index --refresh && | ||
test_is_magic_mtime .git/index +60 | ||
' | ||
|
||
test_expect_success '--refresh should fix racy timestamp' ' | ||
reset_files && | ||
update_assert_changed --refresh | ||
' | ||
|
||
test_expect_success '--really-refresh should fix racy timestamp' ' | ||
reset_files && | ||
update_assert_changed --really-refresh | ||
' | ||
|
||
test_expect_success '--refresh should fix racy timestamp if other file needs update' ' | ||
reset_files && | ||
echo content2 >other && | ||
test_set_magic_mtime other && | ||
update_assert_changed --refresh | ||
' | ||
|
||
test_expect_success '--refresh should fix racy timestamp if racy file needs update' ' | ||
reset_files && | ||
echo content2 >file && | ||
test_set_magic_mtime file && | ||
update_assert_changed --refresh | ||
' | ||
|
||
test_done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters