averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

t34xx: don't expire reflogs where it matters

Browse Source 
We have a couple of tests in the t34xx range that rely on reflogs. This
never really used to be a problem, but in a subsequent commit we will
change the default maintenance strategy from "gc" to "geometric", and
this will cause us to drop all reflogs in these tests.

This may seem surprising and like a bug at first, but it's actually not.
The main difference between these two strategies is that the "gc"
strategy will skip all maintenance in case the object database is in a
well-optimized state. The "geometric" strategy has separate subtasks
though, and the conditions for each of these tasks is evaluated on a
case by case basis. This means that even if the object database is in
good shape, we may still decide to expire reflogs.

So why is that a problem? The issue is that Git's test suite hardcodes
the committer and author dates to a date in 2005. Interestingly though,
these hardcoded dates not only impact the commits, but also the reflog
entries. The consequence is that all newly written reflog entries are
immediately considered stale as our reflog expiration threshold is in
the range of weeks, only. It follows that executing `git reflog expire`
will thus immediately purge all reflog entries.

This hasn't been a problem in our test suite by pure chance, as the
repository shapes simply didn't cause us to perform actual garbage
collection. But with the upcoming "geometric" strategy we _will_ start
to execute `git reflog expire`, thus surfacing this issue.

Prepare for this by explicitly disabling reflog expiration in tests
impacted by this upcoming change.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2026-02-24 09:45:47 +01:00
committed by Junio C Hamano
parent 5e6c612720
commit ea7d894f44
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3404-rebase-interactive.sh
View File

@@ -31,6 +31,12 @@ Initial setup:
. "$TEST_DIRECTORY"/lib-rebase.sh
test_expect_success 'setup' '
# Commit dates are hardcoded to 2005, and the reflog entries will have
# a matching timestamp. Maintenance may thus immediately expire
# reflogs if it was running.
git config set gc.reflogExpire never &&
git config set gc.reflogExpireUnreachable never &&
git switch -C primary &&
test_commit A file1 &&
test_commit B file1 &&

6
t/t3406-rebase-message.sh
View File

@@ -8,6 +8,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success 'setup' '
# Commit dates are hardcoded to 2005, and the reflog entries will have
# a matching timestamp. Maintenance may thus immediately expire
# reflogs if it was running.
git config set gc.reflogExpire never &&
git config set gc.reflogExpireUnreachable never &&
test_commit O fileO &&
test_commit X fileX &&
git branch fast-forward &&

6
t/t3431-rebase-fork-point.sh
View File

@@ -17,6 +17,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
# C was formerly part of main but main was rewound to remove C
#
test_expect_success setup '
# Commit dates are hardcoded to 2005, and the reflog entries will have
# a matching timestamp. Maintenance may thus immediately expire
# reflogs if it was running.
git config set gc.reflogExpire never &&
git config set gc.reflogExpireUnreachable never &&
test_commit A &&
test_commit B &&
test_commit C &&

6
t/t3432-rebase-fast-forward.sh
View File

@@ -11,6 +11,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success setup '
# Commit dates are hardcoded to 2005, and the reflog entries will have
# a matching timestamp. Maintenance may thus immediately expire
# reflogs if it was running.
git config set gc.reflogExpire never &&
git config set gc.reflogExpireUnreachable never &&
test_commit A &&
test_commit B &&
test_commit C &&