summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-11 15:27:21 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-11 15:27:22 +0900
commit8ca4771dd0889ce269780b5f2b48166ffaff9570 (patch)
tree861682757107951cca2ef20e9649b85367101f06 /builtin
parentThe fifteenth batch (diff)
parentbisect--helper: use BISECT_TERMS in 'bisect skip' command (diff)
downloadtgif-8ca4771dd0889ce269780b5f2b48166ffaff9570.tar.xz
Merge branch 'rj/bisect-skip-honor-terms'
"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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/bisect--helper.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 1fdb7d9d10..9d9540a0ab 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -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: