[PATCH v15 14/27] t6030: no cleanup with bad merge base
- From
Pranit Bauva <pranit.bauva@gmail.com>
- Date
- Oct 14, 2016, 14:14 UTC
- Message-ID
- <01020157c38b1adc-d5fa6b9a-ce13-4ee9-874e-e45fac99fba6-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000000@eu-west-1.amazonses.com>
The bisection cleanup should be performed with bad merge base so that the user can return to its original position with `git bisect reset`.
Mentored-by: Lars Schneider <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> --- t/t6030-bisect-porcelain.sh | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index e62e2a8..8ac77ee 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -911,4 +911,11 @@ test_expect_success 'git bisect reset cleans bisection state properly' ' test_path_is_missing "$GIT_DIR/BISECT_START" ' +test_expect_success 'check whether bisection cleanup is not done with bad merges' ' + git bisect start $HASH7 $SIDE_HASH7 && + test_expect_failure git bisect bad >out 2>out && + test_i18ngrep "The merge base" out && + test -e .git/BISECT_START +' + test_done -- https://github.com/git/git/pull/287