diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-30 08:00:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-30 08:00:57 -0700 |
| commit | b743410ab63cf14a032b6e3d868ea78161cb0d29 (patch) | |
| tree | e424219621798f80bd149245f111264206d5c4f6 | |
| parent | Sync with 'master' (diff) | |
| parent | t1016-compatObjectFormat: really freeze time for reproduciblity (diff) | |
| download | git-b743410ab63cf14a032b6e3d868ea78161cb0d29.tar.gz git-b743410ab63cf14a032b6e3d868ea78161cb0d29.zip | |
Merge branch 'eb/t1016-hash-transition-fix' into next
Test fix.
* eb/t1016-hash-transition-fix:
t1016-compatObjectFormat: really freeze time for reproduciblity
| -rwxr-xr-x | t/t1016-compatObjectFormat.sh | 6 | ||||
| -rwxr-xr-x | t/t1016/gpg | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh index a9af8b2396..0efce53f3a 100755 --- a/t/t1016-compatObjectFormat.sh +++ b/t/t1016-compatObjectFormat.sh @@ -21,6 +21,12 @@ test_description='Test how well compatObjectFormat works' # different hash functions result in the same content in the commits. # This means that when the commit is translated between hash functions # the commit is identical to the commit in the other repository. +# +# Similarly this test relies on: +# gpg --faked-system-time '20230918T154812! +# freezing the system time from gpg perspective so that two different +# runs of gpg applied to the same data result in identical signatures. +# compat_hash () { case "$1" in diff --git a/t/t1016/gpg b/t/t1016/gpg index 2601cb18a5..34d6e055fc 100755 --- a/t/t1016/gpg +++ b/t/t1016/gpg @@ -1,2 +1,2 @@ #!/bin/sh -exec gpg --faked-system-time "20230918T154812" "$@" +exec gpg --faked-system-time '20230918T154812!' "$@" |