From: "Marc Strapetz via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Marc Strapetz <marc.strapetz@syntevo.com>
Subject: [PATCH v4 0/4] update-index: refresh should rewrite index in case of racy timestamps
Date: Fri, 07 Jan 2022 11:17:27 +0000 [thread overview]
Message-ID: <pull.1105.v4.git.1641554252.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1105.v3.git.1641508499.gitgitgadget@gmail.com>
This patch makes update-index --refresh write the index if it contains racy
timestamps, as discussed at [1].
Changes since v3:
* test-lib: improve API for verifying file mtime
* fix quoting around "$1"
* use "rm -f" for cleanup of auxiliary files
* improve API description comments
* Note that gitgitgadget's "freebsd_12" check is failing since a couple of
days (unrelated to this pull request); hence, this check hasn't been
applied to this patch series
Changes since v2:
* new patch: test-lib: introduce API for verifying file mtime
* new patch: t7508: fix bogus mtime verification for test
"--no-optional-locks prevents index update"
* change new tests in t2108 and t7508 to use new test-lib mtime API
* fix "--refresh has no racy timestamps to fix" to use +60s mtime to be
save on VFAT
Changes since v1:
* main commit message now uses 'git update-index' and the paragraph was
dropped
* t/t7508-status.sh: two tests added which capture status racy handling
* builtin/update-index.c: comment improved
* t/t2108-update-index-refresh-racy.sh: major overhaul
* one test case added
* mtime-manipulations simplified and aligned to t7508
* code style fixes, as discussed
[1]
https://lore.kernel.org/git/d3dd805c-7c1d-30a9-6574-a7bfcb7fc013@syntevo.com/
Marc Strapetz (4):
test-lib: introduce API for verifying file mtime
t7508: fix bogus mtime verification
t7508: add tests capturing racy timestamp handling
update-index: refresh should rewrite index in case of racy timestamps
builtin/update-index.c | 11 +++++
cache.h | 1 +
read-cache.c | 2 +-
t/t2108-update-index-refresh-racy.sh | 64 ++++++++++++++++++++++++++++
t/t7508-status.sh | 30 ++++++++++---
t/test-lib-functions.sh | 33 ++++++++++++++
6 files changed, 135 insertions(+), 6 deletions(-)
create mode 100755 t/t2108-update-index-refresh-racy.sh
base-commit: dcc0cd074f0c639a0df20461a301af6d45bd582e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1105%2Fmstrap%2Ffeature%2Fupdate-index-refresh-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1105/mstrap/feature/update-index-refresh-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1105
Range-diff vs v3:
1: e6301e9d770 ! 1: 37c11bfafc4 test-lib: introduce API for verifying file mtime
@@ t/test-lib-functions.sh: test_region () {
perl -le 'print readlink($_) for @ARGV' "$@"
}
+
-+# Set a fixed "magic" mtime to the given file,
-+# with an optional increment specified as second argument.
-+# Use in combination with test_is_magic_mtime.
++# Set mtime to a fixed "magic" timestamp in mid February 2009, before we
++# run an operation that may or may not touch the file. If the file was
++# touched, its timestamp will not accidentally have such an old timestamp,
++# as long as your filesystem clock is reasonably correct. To verify the
++# timestamp, follow up with test_is_magic_mtime.
++#
++# An optional increment to the magic timestamp may be specified as second
++# argument.
+test_set_magic_mtime () {
-+ # We are using 1234567890 because it's a common timestamp used in
-+ # various tests. It represents date 2009-02-13 which should be safe
-+ # to use as long as the filetime clock is reasonably accurate.
+ local inc=${2:-0} &&
+ local mtime=$((1234567890 + $inc)) &&
-+ test-tool chmtime =$mtime $1 &&
-+ test_is_magic_mtime $1 $inc
++ test-tool chmtime =$mtime "$1" &&
++ test_is_magic_mtime "$1" $inc
+}
+
-+# Test whether the given file has the "magic" mtime set,
-+# with an optional increment specified as second argument.
-+# Use in combination with test_set_magic_mtime.
++# Test whether the given file has the "magic" mtime set. This is meant to
++# be used in combination with test_set_magic_mtime.
++#
++# An optional increment to the magic timestamp may be specified as second
++# argument. Usually, this should be the same increment which was used for
++# the associated test_set_magic_mtime.
+test_is_magic_mtime () {
+ local inc=${2:-0} &&
+ local mtime=$((1234567890 + $inc)) &&
+ echo $mtime >.git/test-mtime-expect &&
-+ test-tool chmtime --get $1 >.git/test-mtime-actual &&
++ test-tool chmtime --get "$1" >.git/test-mtime-actual &&
+ test_cmp .git/test-mtime-expect .git/test-mtime-actual
+ local ret=$?
-+ rm .git/test-mtime-expect
-+ rm .git/test-mtime-actual
++ rm -f .git/test-mtime-expect
++ rm -f .git/test-mtime-actual
+ return $ret
+}
2: d15a23cc804 = 2: c97a41af389 t7508: fix bogus mtime verification
3: 3567ef91e7a = 3: 82d0b6ab8d2 t7508: add tests capturing racy timestamp handling
4: 4a6b18fb304 = 4: e31edb74e24 update-index: refresh should rewrite index in case of racy timestamps
--
gitgitgadget
next prev parent reply other threads:[~2022-01-07 11:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 13:56 [PATCH] update-index: refresh should rewrite index in case of racy timestamps Marc Strapetz via GitGitGadget
2021-12-22 23:52 ` Junio C Hamano
2021-12-23 18:24 ` Marc Strapetz
2022-01-05 13:15 ` [PATCH v2 0/2] " Marc Strapetz via GitGitGadget
2022-01-05 13:15 ` [PATCH v2 1/2] t7508: add tests capturing racy timestamp handling Marc Strapetz via GitGitGadget
2022-01-05 20:59 ` Junio C Hamano
2022-01-06 10:21 ` Marc Strapetz
2022-01-05 13:15 ` [PATCH v2 2/2] update-index: refresh should rewrite index in case of racy timestamps Marc Strapetz via GitGitGadget
2022-01-05 21:03 ` Junio C Hamano
2022-01-06 22:34 ` [PATCH v3 0/4] " Marc Strapetz via GitGitGadget
2022-01-06 22:34 ` [PATCH v3 1/4] test-lib: introduce API for verifying file mtime Marc Strapetz via GitGitGadget
2022-01-06 23:55 ` Junio C Hamano
2022-01-06 22:34 ` [PATCH v3 2/4] t7508: fix bogus mtime verification Marc Strapetz via GitGitGadget
2022-01-06 22:34 ` [PATCH v3 3/4] t7508: add tests capturing racy timestamp handling Marc Strapetz via GitGitGadget
2022-01-06 22:34 ` [PATCH v3 4/4] update-index: refresh should rewrite index in case of racy timestamps Marc Strapetz via GitGitGadget
2022-01-07 11:17 ` Marc Strapetz via GitGitGadget [this message]
2022-01-07 11:17 ` [PATCH v4 1/4] test-lib: introduce API for verifying file mtime Marc Strapetz via GitGitGadget
2022-01-07 11:17 ` [PATCH v4 2/4] t7508: fix bogus mtime verification Marc Strapetz via GitGitGadget
2022-01-07 11:17 ` [PATCH v4 3/4] t7508: add tests capturing racy timestamp handling Marc Strapetz via GitGitGadget
2022-01-07 11:17 ` [PATCH v4 4/4] update-index: refresh should rewrite index in case of racy timestamps Marc Strapetz via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1105.v4.git.1641554252.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=marc.strapetz@syntevo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).