@matheusbsbs / matheus-bagliano / commits / ea7d894f44

t34xx: don't expire reflogs where it matters

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>

Patrick Steinhardt committed Feb 24, 2026 at 09:45 UTC ea7d894f449d7f212ddf8a12a67f78467581b23f

4 files changed +24

t/t3404-rebase-interactive.sh

@@ -31,6 +31,12 @@ Initial setup:

31 . "$TEST_DIRECTORY"/lib-rebase.sh

33 test_expect_success 'setup' '

34 + # Commit dates are hardcoded to 2005, and the reflog entries will have

35 + # a matching timestamp. Maintenance may thus immediately expire

36 + # reflogs if it was running.

37 + git config set gc.reflogExpire never &&

38 + git config set gc.reflogExpireUnreachable never &&

39 +

40 git switch -C primary &&

41 test_commit A file1 &&

42 test_commit B file1 &&

t/t3406-rebase-message.sh

@@ -8,6 +8,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

8 . ./test-lib.sh

10 test_expect_success 'setup' '

11 + # Commit dates are hardcoded to 2005, and the reflog entries will have

12 + # a matching timestamp. Maintenance may thus immediately expire

13 + # reflogs if it was running.

14 + git config set gc.reflogExpire never &&

15 + git config set gc.reflogExpireUnreachable never &&

16 +

17 test_commit O fileO &&

18 test_commit X fileX &&

19 git branch fast-forward &&

t/t3431-rebase-fork-point.sh

@@ -17,6 +17,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

17 # C was formerly part of main but main was rewound to remove C

18 #

19 test_expect_success setup '

20 + # Commit dates are hardcoded to 2005, and the reflog entries will have

21 + # a matching timestamp. Maintenance may thus immediately expire

22 + # reflogs if it was running.

23 + git config set gc.reflogExpire never &&

24 + git config set gc.reflogExpireUnreachable never &&

25 +

26 test_commit A &&

27 test_commit B &&

28 test_commit C &&

t/t3432-rebase-fast-forward.sh

@@ -11,6 +11,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

11 . ./test-lib.sh

13 test_expect_success setup '

14 + # Commit dates are hardcoded to 2005, and the reflog entries will have

15 + # a matching timestamp. Maintenance may thus immediately expire

16 + # reflogs if it was running.

17 + git config set gc.reflogExpire never &&

18 + git config set gc.reflogExpireUnreachable never &&

19 +

20 test_commit A &&

21 test_commit B &&

22 test_commit C &&