diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-20 21:14:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-20 21:14:54 +0300 |
| commit | 67dfb897b3ea438a5a7bb29af2cd0360235e5191 (patch) | |
| tree | a75698277601cbe8a50abe8c06c23669065026ab /t | |
| parent | 9eec6a1c5fc03e5f01f200bdb28f1dc6b8e9f03e (diff) | |
| parent | daaa03e54c481b4906b4b6a80d89dbb5a239e509 (diff) | |
Merge branch 'jk/bisect-reset-fix'
"git bisect reset" has been taught to clean up state files and refs
even when BISECT_START file is gone.
* jk/bisect-reset-fix:
bisect: always clean on reset
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 2a5b7d8379..7b24d1684e 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -170,6 +170,12 @@ test_expect_success 'bisect reset when not bisecting' ' cmp branch.expect branch.output ' +test_expect_success 'bisect reset cleans up even when not bisecting' ' + echo garbage >.git/BISECT_LOG && + git bisect reset && + test_path_is_missing .git/BISECT_LOG +' + test_expect_success 'bisect reset removes packed refs' ' git bisect reset && git bisect start && |