diff options
| author | Elijah Newren <newren@gmail.com> | 2023-11-24 12:10:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-26 10:10:47 +0900 |
| commit | b9d0991cc702204e14e65abf95d5fc24305e542b (patch) | |
| tree | 30e793fd3f63c4594413233ab790903d64226794 /git.c | |
| parent | bc5204569f7db44d22477485afd52ea410d83743 (diff) | |
| download | git-b9d0991cc702204e14e65abf95d5fc24305e542b.tar.gz | |
t6429: remove switching aspects of fast-rebase
At the time t6429 was written, merge-ort was still under development,
did not have quite as many tests, and certainly was not widely deployed.
Since t6429 was exercising some codepaths just a little differently, we
thought having them also test the "merge_switch_to_result()" bits of
merge-ort was useful even though they weren't intrinsic to the real
point of these tests.
However, the value provided by doing extra testing of the
"merge_switch_to_result()" bits has decreased a bit over time, and it's
actively making it harder to refactor `test-tool fast-rebase` into `git
replay`, which we are going to do in following commits. Dispense with
these bits.
Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions