mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 14:06:12 +02:00
Code

Merge branch 'rj/bisect-skip-honor-terms' into next 

"git bisect skip" when custom words are used for new/old did not
work, which has been corrected.

* rj/bisect-skip-honor-terms:
  bisect--helper: use BISECT_TERMS in 'bisect skip' command
This commit is contained in:
Junio C Hamano 2021-05-04 14:07:18 +09:00
parent 12c5fe8677 4cd66e7d6b
commit f7c11bba06
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/bisect--helper.c
View File

@ -1126,6 +1126,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
break;
case BISECT_SKIP:
set_terms(&terms, "bad", "good");
get_terms(&terms);
res = bisect_skip(&terms, argv, argc);
break;
default:

11
t/t6030-bisect-porcelain.sh
View File

@ -922,6 +922,17 @@ test_expect_success 'bisect start takes options and revs in any order' '
test_cmp expected actual
'
# Bisect is started with --term-new and --term-old arguments,
# then skip. The HEAD should be changed.
test_expect_success 'bisect skip works with --term*' '
git bisect reset &&
git bisect start --term-new=fixed --term-old=unfixed HEAD $HASH1 &&
hash_skipped_from=$(git rev-parse --verify HEAD) &&
git bisect skip &&
hash_skipped_to=$(git rev-parse --verify HEAD) &&
test "$hash_skipped_from" != "$hash_skipped_to"
'
test_expect_success 'git bisect reset cleans bisection state properly' '
git bisect reset &&
git bisect start &&