Skip to content

Commit 5086f2c

Browse files
committed
t6429: update comment to mention correct tool
A comment at the top of t6429 mentions why the test doesn't exercise git rebase or git cherry-pick. However, it claims that it uses `test-tool fast-rebase`. That was true when the comment was written, but commit f920b02 (replay: introduce new builtin, 2023-11-24) changed it to use git replay without updating this comment. We could potentially just strike this second comment, since git replay is a bonified built-in, but perhaps the explanation about why it focuses on git replay is still useful. Update the comment to make it accurate again. Signed-off-by: Elijah Newren <newren@gmail.com>
1 parent 81f86aa commit 5086f2c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

t/t6429-merge-sequence-rename-caching.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ test_description="remember regular & dir renames in sequence of merges"
1111
# sure that we are triggering rename caching rather than rename
1212
# bypassing.
1313
#
14-
# NOTE 2: this testfile uses 'test-tool fast-rebase' instead of either
15-
# cherry-pick or rebase. sequencer.c is only superficially
16-
# integrated with merge-ort; it calls merge_switch_to_result()
17-
# after EACH merge, which updates the index and working copy AND
18-
# throws away the cached results (because merge_switch_to_result()
19-
# is only supposed to be called at the end of the sequence).
20-
# Integrating them more deeply is a big task, so for now the tests
21-
# use 'test-tool fast-rebase'.
14+
# NOTE 2: this testfile uses replay instead of either cherry-pick or rebase.
15+
# sequencer.c is only superficially integrated with merge-ort; it
16+
# calls merge_switch_to_result() after EACH merge, which updates the
17+
# index and working copy AND throws away the cached results (because
18+
# merge_switch_to_result() is only supposed to be called at the end
19+
# of the sequence). Integrating them more deeply is a big task, so
20+
# for now the tests use 'git replay'.
2221
#
2322

2423

0 commit comments

Comments
 (0)