3 #include "parse-options.h"
8 #include "run-command.h"
13 static GIT_PATH_FUNC(git_path_bisect_terms
, "BISECT_TERMS")
14 static GIT_PATH_FUNC(git_path_bisect_expected_rev
, "BISECT_EXPECTED_REV")
15 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok
, "BISECT_ANCESTORS_OK")
16 static GIT_PATH_FUNC(git_path_bisect_start
, "BISECT_START")
17 static GIT_PATH_FUNC(git_path_bisect_log
, "BISECT_LOG")
18 static GIT_PATH_FUNC(git_path_head_name
, "head-name")
19 static GIT_PATH_FUNC(git_path_bisect_names
, "BISECT_NAMES")
20 static GIT_PATH_FUNC(git_path_bisect_first_parent
, "BISECT_FIRST_PARENT")
21 static GIT_PATH_FUNC(git_path_bisect_run
, "BISECT_RUN")
23 static const char * const git_bisect_helper_usage
[] = {
24 N_("git bisect--helper --bisect-reset [<commit>]"),
25 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]",
26 N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
27 " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
28 "git bisect--helper --bisect-next",
29 N_("git bisect--helper --bisect-state (bad|new) [<rev>]"),
30 N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
31 N_("git bisect--helper --bisect-replay <filename>"),
32 N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
33 "git bisect--helper --bisect-visualize",
34 N_("git bisect--helper --bisect-run <cmd>..."),
38 struct add_bisect_ref_data
{
39 struct rev_info
*revs
;
40 unsigned int object_flags
;
48 static void free_terms(struct bisect_terms
*terms
)
50 FREE_AND_NULL(terms
->term_good
);
51 FREE_AND_NULL(terms
->term_bad
);
54 static void set_terms(struct bisect_terms
*terms
, const char *bad
,
57 free((void *)terms
->term_good
);
58 terms
->term_good
= xstrdup(good
);
59 free((void *)terms
->term_bad
);
60 terms
->term_bad
= xstrdup(bad
);
63 static const char vocab_bad
[] = "bad|new";
64 static const char vocab_good
[] = "good|old";
66 static int bisect_autostart(struct bisect_terms
*terms
);
69 * Check whether the string `term` belongs to the set of strings
70 * included in the variable arguments.
73 static int one_of(const char *term
, ...)
79 va_start(matches
, term
);
80 while (!res
&& (match
= va_arg(matches
, const char *)))
81 res
= !strcmp(term
, match
);
88 * return code BISECT_INTERNAL_SUCCESS_MERGE_BASE
89 * and BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND are codes
90 * that indicate special success.
93 static int is_bisect_success(enum bisect_error res
)
96 res
== BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
||
97 res
== BISECT_INTERNAL_SUCCESS_MERGE_BASE
;
100 static int write_in_file(const char *path
, const char *mode
, const char *format
, va_list args
)
105 if (strcmp(mode
, "w") && strcmp(mode
, "a"))
106 BUG("write-in-file does not support '%s' mode", mode
);
107 fp
= fopen(path
, mode
);
109 return error_errno(_("cannot open file '%s' in mode '%s'"), path
, mode
);
110 res
= vfprintf(fp
, format
, args
);
113 int saved_errno
= errno
;
116 return error_errno(_("could not write to file '%s'"), path
);
122 __attribute__((format (printf
, 2, 3)))
123 static int write_to_file(const char *path
, const char *format
, ...)
128 va_start(args
, format
);
129 res
= write_in_file(path
, "w", format
, args
);
135 __attribute__((format (printf
, 2, 3)))
136 static int append_to_file(const char *path
, const char *format
, ...)
141 va_start(args
, format
);
142 res
= write_in_file(path
, "a", format
, args
);
148 static int print_file_to_stdout(const char *path
)
150 int fd
= open(path
, O_RDONLY
);
154 return error_errno(_("cannot open file '%s' for reading"), path
);
155 if (copy_fd(fd
, 1) < 0)
156 ret
= error_errno(_("failed to read '%s'"), path
);
161 static int check_term_format(const char *term
, const char *orig_term
)
164 char *new_term
= xstrfmt("refs/bisect/%s", term
);
166 res
= check_refname_format(new_term
, 0);
170 return error(_("'%s' is not a valid term"), term
);
172 if (one_of(term
, "help", "start", "skip", "next", "reset",
173 "visualize", "view", "replay", "log", "run", "terms", NULL
))
174 return error(_("can't use the builtin command '%s' as a term"), term
);
177 * In theory, nothing prevents swapping completely good and bad,
178 * but this situation could be confusing and hasn't been tested
179 * enough. Forbid it for now.
182 if ((strcmp(orig_term
, "bad") && one_of(term
, "bad", "new", NULL
)) ||
183 (strcmp(orig_term
, "good") && one_of(term
, "good", "old", NULL
)))
184 return error(_("can't change the meaning of the term '%s'"), term
);
189 static int write_terms(const char *bad
, const char *good
)
193 if (!strcmp(bad
, good
))
194 return error(_("please use two different terms"));
196 if (check_term_format(bad
, "bad") || check_term_format(good
, "good"))
199 res
= write_to_file(git_path_bisect_terms(), "%s\n%s\n", bad
, good
);
204 static int bisect_reset(const char *commit
)
206 struct strbuf branch
= STRBUF_INIT
;
209 if (strbuf_read_file(&branch
, git_path_bisect_start(), 0) < 1) {
210 printf(_("We are not bisecting.\n"));
213 strbuf_rtrim(&branch
);
215 struct object_id oid
;
217 if (get_oid_commit(commit
, &oid
))
218 return error(_("'%s' is not a valid commit"), commit
);
219 strbuf_addstr(&branch
, commit
);
222 if (!ref_exists("BISECT_HEAD")) {
223 struct child_process cmd
= CHILD_PROCESS_INIT
;
226 strvec_pushl(&cmd
.args
, "checkout", branch
.buf
, "--", NULL
);
227 if (run_command(&cmd
)) {
228 error(_("could not check out original"
229 " HEAD '%s'. Try 'git bisect"
230 " reset <commit>'."), branch
.buf
);
231 strbuf_release(&branch
);
236 strbuf_release(&branch
);
237 return bisect_clean_state();
240 static void log_commit(FILE *fp
, char *fmt
, const char *state
,
241 struct commit
*commit
)
243 struct pretty_print_context pp
= {0};
244 struct strbuf commit_msg
= STRBUF_INIT
;
245 char *label
= xstrfmt(fmt
, state
);
247 format_commit_message(commit
, "%s", &commit_msg
, &pp
);
249 fprintf(fp
, "# %s: [%s] %s\n", label
, oid_to_hex(&commit
->object
.oid
),
252 strbuf_release(&commit_msg
);
256 static int bisect_write(const char *state
, const char *rev
,
257 const struct bisect_terms
*terms
, int nolog
)
259 struct strbuf tag
= STRBUF_INIT
;
260 struct object_id oid
;
261 struct commit
*commit
;
265 if (!strcmp(state
, terms
->term_bad
)) {
266 strbuf_addf(&tag
, "refs/bisect/%s", state
);
267 } else if (one_of(state
, terms
->term_good
, "skip", NULL
)) {
268 strbuf_addf(&tag
, "refs/bisect/%s-%s", state
, rev
);
270 res
= error(_("Bad bisect_write argument: %s"), state
);
274 if (get_oid(rev
, &oid
)) {
275 res
= error(_("couldn't get the oid of the rev '%s'"), rev
);
279 if (update_ref(NULL
, tag
.buf
, &oid
, NULL
, 0,
280 UPDATE_REFS_MSG_ON_ERR
)) {
285 fp
= fopen(git_path_bisect_log(), "a");
287 res
= error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
291 commit
= lookup_commit_reference(the_repository
, &oid
);
292 log_commit(fp
, "%s", state
, commit
);
295 fprintf(fp
, "git bisect %s %s\n", state
, rev
);
300 strbuf_release(&tag
);
304 static int check_and_set_terms(struct bisect_terms
*terms
, const char *cmd
)
306 int has_term_file
= !is_empty_or_missing_file(git_path_bisect_terms());
308 if (one_of(cmd
, "skip", "start", "terms", NULL
))
311 if (has_term_file
&& strcmp(cmd
, terms
->term_bad
) &&
312 strcmp(cmd
, terms
->term_good
))
313 return error(_("Invalid command: you're currently in a "
314 "%s/%s bisect"), terms
->term_bad
,
317 if (!has_term_file
) {
318 if (one_of(cmd
, "bad", "good", NULL
)) {
319 set_terms(terms
, "bad", "good");
320 return write_terms(terms
->term_bad
, terms
->term_good
);
322 if (one_of(cmd
, "new", "old", NULL
)) {
323 set_terms(terms
, "new", "old");
324 return write_terms(terms
->term_bad
, terms
->term_good
);
331 static int inc_nr(const char *refname UNUSED
,
332 const struct object_id
*oid UNUSED
,
333 int flag UNUSED
, void *cb_data
)
335 unsigned int *nr
= (unsigned int *)cb_data
;
340 static const char need_bad_and_good_revision_warning
[] =
341 N_("You need to give me at least one %s and %s revision.\n"
342 "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
344 static const char need_bisect_start_warning
[] =
345 N_("You need to start by \"git bisect start\".\n"
346 "You then need to give me at least one %s and %s revision.\n"
347 "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
349 static int decide_next(const struct bisect_terms
*terms
,
350 const char *current_term
, int missing_good
,
353 if (!missing_good
&& !missing_bad
)
358 if (missing_good
&& !missing_bad
&&
359 !strcmp(current_term
, terms
->term_good
)) {
362 * have bad (or new) but not good (or old). We could bisect
363 * although this is less optimum.
365 warning(_("bisecting only with a %s commit"), terms
->term_bad
);
369 * TRANSLATORS: Make sure to include [Y] and [n] in your
370 * translation. The program will only accept English input
373 yesno
= git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO
);
374 if (starts_with(yesno
, "N") || starts_with(yesno
, "n"))
379 if (!is_empty_or_missing_file(git_path_bisect_start()))
380 return error(_(need_bad_and_good_revision_warning
),
381 vocab_bad
, vocab_good
, vocab_bad
, vocab_good
);
383 return error(_(need_bisect_start_warning
),
384 vocab_good
, vocab_bad
, vocab_good
, vocab_bad
);
387 static void bisect_status(struct bisect_state
*state
,
388 const struct bisect_terms
*terms
)
390 char *bad_ref
= xstrfmt("refs/bisect/%s", terms
->term_bad
);
391 char *good_glob
= xstrfmt("%s-*", terms
->term_good
);
393 if (ref_exists(bad_ref
))
396 for_each_glob_ref_in(inc_nr
, good_glob
, "refs/bisect/",
397 (void *) &state
->nr_good
);
403 __attribute__((format (printf
, 1, 2)))
404 static void bisect_log_printf(const char *fmt
, ...)
406 struct strbuf buf
= STRBUF_INIT
;
410 strbuf_vaddf(&buf
, fmt
, ap
);
413 printf("%s", buf
.buf
);
414 append_to_file(git_path_bisect_log(), "# %s", buf
.buf
);
416 strbuf_release(&buf
);
419 static void bisect_print_status(const struct bisect_terms
*terms
)
421 struct bisect_state state
= { 0 };
423 bisect_status(&state
, terms
);
425 /* If we had both, we'd already be started, and shouldn't get here. */
426 if (state
.nr_good
&& state
.nr_bad
)
429 if (!state
.nr_good
&& !state
.nr_bad
)
430 bisect_log_printf(_("status: waiting for both good and bad commits\n"));
431 else if (state
.nr_good
)
432 bisect_log_printf(Q_("status: waiting for bad commit, %d good commit known\n",
433 "status: waiting for bad commit, %d good commits known\n",
434 state
.nr_good
), state
.nr_good
);
436 bisect_log_printf(_("status: waiting for good commit(s), bad commit known\n"));
439 static int bisect_next_check(const struct bisect_terms
*terms
,
440 const char *current_term
)
442 struct bisect_state state
= { 0 };
443 bisect_status(&state
, terms
);
444 return decide_next(terms
, current_term
, !state
.nr_good
, !state
.nr_bad
);
447 static int get_terms(struct bisect_terms
*terms
)
449 struct strbuf str
= STRBUF_INIT
;
453 fp
= fopen(git_path_bisect_terms(), "r");
460 strbuf_getline_lf(&str
, fp
);
461 terms
->term_bad
= strbuf_detach(&str
, NULL
);
462 strbuf_getline_lf(&str
, fp
);
463 terms
->term_good
= strbuf_detach(&str
, NULL
);
468 strbuf_release(&str
);
472 static int bisect_terms(struct bisect_terms
*terms
, const char *option
)
474 if (get_terms(terms
))
475 return error(_("no terms defined"));
478 printf(_("Your current terms are %s for the old state\n"
479 "and %s for the new state.\n"),
480 terms
->term_good
, terms
->term_bad
);
483 if (one_of(option
, "--term-good", "--term-old", NULL
))
484 printf("%s\n", terms
->term_good
);
485 else if (one_of(option
, "--term-bad", "--term-new", NULL
))
486 printf("%s\n", terms
->term_bad
);
488 return error(_("invalid argument %s for 'git bisect terms'.\n"
489 "Supported options are: "
490 "--term-good|--term-old and "
491 "--term-bad|--term-new."), option
);
496 static int bisect_append_log_quoted(const char **argv
)
499 FILE *fp
= fopen(git_path_bisect_log(), "a");
500 struct strbuf orig_args
= STRBUF_INIT
;
505 if (fprintf(fp
, "git bisect start") < 1) {
510 sq_quote_argv(&orig_args
, argv
);
511 if (fprintf(fp
, "%s\n", orig_args
.buf
) < 1)
516 strbuf_release(&orig_args
);
520 static int add_bisect_ref(const char *refname
, const struct object_id
*oid
,
521 int flags UNUSED
, void *cb
)
523 struct add_bisect_ref_data
*data
= cb
;
525 add_pending_oid(data
->revs
, refname
, oid
, data
->object_flags
);
530 static int prepare_revs(struct bisect_terms
*terms
, struct rev_info
*revs
)
533 struct add_bisect_ref_data cb
= { revs
};
534 char *good
= xstrfmt("%s-*", terms
->term_good
);
537 * We cannot use terms->term_bad directly in
538 * for_each_glob_ref_in() and we have to append a '*' to it,
539 * otherwise for_each_glob_ref_in() will append '/' and '*'.
541 char *bad
= xstrfmt("%s*", terms
->term_bad
);
544 * It is important to reset the flags used by revision walks
545 * as the previous call to bisect_next_all() in turn
546 * sets up a revision walk.
548 reset_revision_walk();
549 init_revisions(revs
, NULL
);
550 setup_revisions(0, NULL
, revs
, NULL
);
551 for_each_glob_ref_in(add_bisect_ref
, bad
, "refs/bisect/", &cb
);
552 cb
.object_flags
= UNINTERESTING
;
553 for_each_glob_ref_in(add_bisect_ref
, good
, "refs/bisect/", &cb
);
554 if (prepare_revision_walk(revs
))
555 res
= error(_("revision walk setup failed\n"));
562 static int bisect_skipped_commits(struct bisect_terms
*terms
)
566 struct rev_info revs
;
567 struct commit
*commit
;
568 struct pretty_print_context pp
= {0};
569 struct strbuf commit_name
= STRBUF_INIT
;
571 res
= prepare_revs(terms
, &revs
);
575 fp
= fopen(git_path_bisect_log(), "a");
577 return error_errno(_("could not open '%s' for appending"),
578 git_path_bisect_log());
580 if (fprintf(fp
, "# only skipped commits left to test\n") < 0)
581 return error_errno(_("failed to write to '%s'"), git_path_bisect_log());
583 while ((commit
= get_revision(&revs
)) != NULL
) {
584 strbuf_reset(&commit_name
);
585 format_commit_message(commit
, "%s",
587 fprintf(fp
, "# possible first %s commit: [%s] %s\n",
588 terms
->term_bad
, oid_to_hex(&commit
->object
.oid
),
593 * Reset the flags used by revision walks in case
594 * there is another revision walk after this one.
596 reset_revision_walk();
598 strbuf_release(&commit_name
);
599 release_revisions(&revs
);
604 static int bisect_successful(struct bisect_terms
*terms
)
606 struct object_id oid
;
607 struct commit
*commit
;
608 struct pretty_print_context pp
= {0};
609 struct strbuf commit_name
= STRBUF_INIT
;
610 char *bad_ref
= xstrfmt("refs/bisect/%s",terms
->term_bad
);
613 read_ref(bad_ref
, &oid
);
614 commit
= lookup_commit_reference_by_name(bad_ref
);
615 format_commit_message(commit
, "%s", &commit_name
, &pp
);
617 res
= append_to_file(git_path_bisect_log(), "# first %s commit: [%s] %s\n",
618 terms
->term_bad
, oid_to_hex(&commit
->object
.oid
),
621 strbuf_release(&commit_name
);
626 static enum bisect_error
bisect_next(struct bisect_terms
*terms
, const char *prefix
)
628 enum bisect_error res
;
630 if (bisect_autostart(terms
))
631 return BISECT_FAILED
;
633 if (bisect_next_check(terms
, terms
->term_good
))
634 return BISECT_FAILED
;
636 /* Perform all bisection computation */
637 res
= bisect_next_all(the_repository
, prefix
);
639 if (res
== BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
) {
640 res
= bisect_successful(terms
);
641 return res
? res
: BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
;
642 } else if (res
== BISECT_ONLY_SKIPPED_LEFT
) {
643 res
= bisect_skipped_commits(terms
);
644 return res
? res
: BISECT_ONLY_SKIPPED_LEFT
;
649 static enum bisect_error
bisect_auto_next(struct bisect_terms
*terms
, const char *prefix
)
651 if (bisect_next_check(terms
, NULL
)) {
652 bisect_print_status(terms
);
656 return bisect_next(terms
, prefix
);
659 static enum bisect_error
bisect_start(struct bisect_terms
*terms
, const char **argv
, int argc
)
662 int first_parent_only
= 0;
663 int i
, has_double_dash
= 0, must_write_terms
= 0, bad_seen
= 0;
664 int flags
, pathspec_pos
;
665 enum bisect_error res
= BISECT_OK
;
666 struct string_list revs
= STRING_LIST_INIT_DUP
;
667 struct string_list states
= STRING_LIST_INIT_DUP
;
668 struct strbuf start_head
= STRBUF_INIT
;
669 struct strbuf bisect_names
= STRBUF_INIT
;
670 struct object_id head_oid
;
671 struct object_id oid
;
674 if (is_bare_repository())
678 * Check for one bad and then some good revisions
680 for (i
= 0; i
< argc
; i
++) {
681 if (!strcmp(argv
[i
], "--")) {
687 for (i
= 0; i
< argc
; i
++) {
688 const char *arg
= argv
[i
];
689 if (!strcmp(argv
[i
], "--")) {
691 } else if (!strcmp(arg
, "--no-checkout")) {
693 } else if (!strcmp(arg
, "--first-parent")) {
694 first_parent_only
= 1;
695 } else if (!strcmp(arg
, "--term-good") ||
696 !strcmp(arg
, "--term-old")) {
699 return error(_("'' is not a valid term"));
700 must_write_terms
= 1;
701 free((void *) terms
->term_good
);
702 terms
->term_good
= xstrdup(argv
[i
]);
703 } else if (skip_prefix(arg
, "--term-good=", &arg
) ||
704 skip_prefix(arg
, "--term-old=", &arg
)) {
705 must_write_terms
= 1;
706 free((void *) terms
->term_good
);
707 terms
->term_good
= xstrdup(arg
);
708 } else if (!strcmp(arg
, "--term-bad") ||
709 !strcmp(arg
, "--term-new")) {
712 return error(_("'' is not a valid term"));
713 must_write_terms
= 1;
714 free((void *) terms
->term_bad
);
715 terms
->term_bad
= xstrdup(argv
[i
]);
716 } else if (skip_prefix(arg
, "--term-bad=", &arg
) ||
717 skip_prefix(arg
, "--term-new=", &arg
)) {
718 must_write_terms
= 1;
719 free((void *) terms
->term_bad
);
720 terms
->term_bad
= xstrdup(arg
);
721 } else if (starts_with(arg
, "--")) {
722 return error(_("unrecognized option: '%s'"), arg
);
723 } else if (!get_oidf(&oid
, "%s^{commit}", arg
)) {
724 string_list_append(&revs
, oid_to_hex(&oid
));
725 } else if (has_double_dash
) {
726 die(_("'%s' does not appear to be a valid "
735 * The user ran "git bisect start <sha1> <sha1>", hence did not
736 * explicitly specify the terms, but we are already starting to
737 * set references named with the default terms, and won't be able
738 * to change afterwards.
741 must_write_terms
= 1;
742 for (i
= 0; i
< revs
.nr
; i
++) {
744 string_list_append(&states
, terms
->term_good
);
747 string_list_append(&states
, terms
->term_bad
);
754 head
= resolve_ref_unsafe("HEAD", 0, &head_oid
, &flags
);
756 if (get_oid("HEAD", &head_oid
))
757 return error(_("bad HEAD - I need a HEAD"));
760 * Check if we are bisecting
762 if (!is_empty_or_missing_file(git_path_bisect_start())) {
763 /* Reset to the rev from where we started */
764 strbuf_read_file(&start_head
, git_path_bisect_start(), 0);
765 strbuf_trim(&start_head
);
767 struct child_process cmd
= CHILD_PROCESS_INIT
;
770 strvec_pushl(&cmd
.args
, "checkout", start_head
.buf
,
772 if (run_command(&cmd
)) {
773 res
= error(_("checking out '%s' failed."
774 " Try 'git bisect start "
781 /* Get the rev from where we start. */
782 if (!get_oid(head
, &head_oid
) &&
783 !starts_with(head
, "refs/heads/")) {
784 strbuf_reset(&start_head
);
785 strbuf_addstr(&start_head
, oid_to_hex(&head_oid
));
786 } else if (!get_oid(head
, &head_oid
) &&
787 skip_prefix(head
, "refs/heads/", &head
)) {
789 * This error message should only be triggered by
790 * cogito usage, and cogito users should understand
791 * it relates to cg-seek.
793 if (!is_empty_or_missing_file(git_path_head_name()))
794 return error(_("won't bisect on cg-seek'ed tree"));
795 strbuf_addstr(&start_head
, head
);
797 return error(_("bad HEAD - strange symbolic ref"));
802 * Get rid of any old bisect state.
804 if (bisect_clean_state())
805 return BISECT_FAILED
;
808 * Write new start state
810 write_file(git_path_bisect_start(), "%s\n", start_head
.buf
);
812 if (first_parent_only
)
813 write_file(git_path_bisect_first_parent(), "\n");
816 if (get_oid(start_head
.buf
, &oid
) < 0) {
817 res
= error(_("invalid ref: '%s'"), start_head
.buf
);
820 if (update_ref(NULL
, "BISECT_HEAD", &oid
, NULL
, 0,
821 UPDATE_REFS_MSG_ON_ERR
)) {
827 if (pathspec_pos
< argc
- 1)
828 sq_quote_argv(&bisect_names
, argv
+ pathspec_pos
);
829 write_file(git_path_bisect_names(), "%s\n", bisect_names
.buf
);
831 for (i
= 0; i
< states
.nr
; i
++)
832 if (bisect_write(states
.items
[i
].string
,
833 revs
.items
[i
].string
, terms
, 1)) {
838 if (must_write_terms
&& write_terms(terms
->term_bad
,
844 res
= bisect_append_log_quoted(argv
);
849 string_list_clear(&revs
, 0);
850 string_list_clear(&states
, 0);
851 strbuf_release(&start_head
);
852 strbuf_release(&bisect_names
);
856 res
= bisect_auto_next(terms
, NULL
);
857 if (!is_bisect_success(res
))
858 bisect_clean_state();
862 static inline int file_is_not_empty(const char *path
)
864 return !is_empty_or_missing_file(path
);
867 static int bisect_autostart(struct bisect_terms
*terms
)
872 if (file_is_not_empty(git_path_bisect_start()))
875 fprintf_ln(stderr
, _("You need to start by \"git bisect "
878 if (!isatty(STDIN_FILENO
))
882 * TRANSLATORS: Make sure to include [Y] and [n] in your
883 * translation. The program will only accept English input
886 yesno
= git_prompt(_("Do you want me to do it for you "
887 "[Y/n]? "), PROMPT_ECHO
);
888 res
= tolower(*yesno
) == 'n' ?
889 -1 : bisect_start(terms
, empty_strvec
, 0);
894 static enum bisect_error
bisect_state(struct bisect_terms
*terms
, const char **argv
,
898 int i
, verify_expected
= 1;
899 struct object_id oid
, expected
;
900 struct strbuf buf
= STRBUF_INIT
;
901 struct oid_array revs
= OID_ARRAY_INIT
;
904 return error(_("Please call `--bisect-state` with at least one argument"));
906 if (bisect_autostart(terms
))
907 return BISECT_FAILED
;
910 if (check_and_set_terms(terms
, state
) ||
911 !one_of(state
, terms
->term_good
, terms
->term_bad
, "skip", NULL
))
912 return BISECT_FAILED
;
916 if (argc
> 1 && !strcmp(state
, terms
->term_bad
))
917 return error(_("'git bisect %s' can take only one argument."), terms
->term_bad
);
920 const char *head
= "BISECT_HEAD";
921 enum get_oid_result res_head
= get_oid(head
, &oid
);
923 if (res_head
== MISSING_OBJECT
) {
925 res_head
= get_oid(head
, &oid
);
929 error(_("Bad rev input: %s"), head
);
930 oid_array_append(&revs
, &oid
);
934 * All input revs must be checked before executing bisect_write()
935 * to discard junk revs.
938 for (; argc
; argc
--, argv
++) {
939 struct commit
*commit
;
941 if (get_oid(*argv
, &oid
)){
942 error(_("Bad rev input: %s"), *argv
);
943 oid_array_clear(&revs
);
944 return BISECT_FAILED
;
947 commit
= lookup_commit_reference(the_repository
, &oid
);
949 die(_("Bad rev input (not a commit): %s"), *argv
);
951 oid_array_append(&revs
, &commit
->object
.oid
);
954 if (strbuf_read_file(&buf
, git_path_bisect_expected_rev(), 0) < the_hash_algo
->hexsz
||
955 get_oid_hex(buf
.buf
, &expected
) < 0)
956 verify_expected
= 0; /* Ignore invalid file contents */
957 strbuf_release(&buf
);
959 for (i
= 0; i
< revs
.nr
; i
++) {
960 if (bisect_write(state
, oid_to_hex(&revs
.oid
[i
]), terms
, 0)) {
961 oid_array_clear(&revs
);
962 return BISECT_FAILED
;
964 if (verify_expected
&& !oideq(&revs
.oid
[i
], &expected
)) {
965 unlink_or_warn(git_path_bisect_ancestors_ok());
966 unlink_or_warn(git_path_bisect_expected_rev());
971 oid_array_clear(&revs
);
972 return bisect_auto_next(terms
, NULL
);
975 static enum bisect_error
bisect_log(void)
978 const char* filename
= git_path_bisect_log();
980 if (is_empty_or_missing_file(filename
))
981 return error(_("We are not bisecting."));
983 fd
= open(filename
, O_RDONLY
);
985 return BISECT_FAILED
;
987 status
= copy_fd(fd
, STDOUT_FILENO
);
989 return status
? BISECT_FAILED
: BISECT_OK
;
992 static int process_replay_line(struct bisect_terms
*terms
, struct strbuf
*line
)
994 const char *p
= line
->buf
+ strspn(line
->buf
, " \t");
995 char *word_end
, *rev
;
997 if ((!skip_prefix(p
, "git bisect", &p
) &&
998 !skip_prefix(p
, "git-bisect", &p
)) || !isspace(*p
))
1000 p
+= strspn(p
, " \t");
1002 word_end
= (char *)p
+ strcspn(p
, " \t");
1003 rev
= word_end
+ strspn(word_end
, " \t");
1004 *word_end
= '\0'; /* NUL-terminate the word */
1007 if (check_and_set_terms(terms
, p
))
1010 if (!strcmp(p
, "start")) {
1011 struct strvec argv
= STRVEC_INIT
;
1013 sq_dequote_to_strvec(rev
, &argv
);
1014 res
= bisect_start(terms
, argv
.v
, argv
.nr
);
1015 strvec_clear(&argv
);
1019 if (one_of(p
, terms
->term_good
,
1020 terms
->term_bad
, "skip", NULL
))
1021 return bisect_write(p
, rev
, terms
, 0);
1023 if (!strcmp(p
, "terms")) {
1024 struct strvec argv
= STRVEC_INIT
;
1026 sq_dequote_to_strvec(rev
, &argv
);
1027 res
= bisect_terms(terms
, argv
.nr
== 1 ? argv
.v
[0] : NULL
);
1028 strvec_clear(&argv
);
1031 error(_("'%s'?? what are you talking about?"), p
);
1036 static enum bisect_error
bisect_replay(struct bisect_terms
*terms
, const char *filename
)
1039 enum bisect_error res
= BISECT_OK
;
1040 struct strbuf line
= STRBUF_INIT
;
1042 if (is_empty_or_missing_file(filename
))
1043 return error(_("cannot read file '%s' for replaying"), filename
);
1045 if (bisect_reset(NULL
))
1046 return BISECT_FAILED
;
1048 fp
= fopen(filename
, "r");
1050 return BISECT_FAILED
;
1052 while ((strbuf_getline(&line
, fp
) != EOF
) && !res
)
1053 res
= process_replay_line(terms
, &line
);
1055 strbuf_release(&line
);
1059 return BISECT_FAILED
;
1061 return bisect_auto_next(terms
, NULL
);
1064 static enum bisect_error
bisect_skip(struct bisect_terms
*terms
, const char **argv
, int argc
)
1067 enum bisect_error res
;
1068 struct strvec argv_state
= STRVEC_INIT
;
1070 strvec_push(&argv_state
, "skip");
1072 for (i
= 0; i
< argc
; i
++) {
1073 const char *dotdot
= strstr(argv
[i
], "..");
1076 struct rev_info revs
;
1077 struct commit
*commit
;
1079 init_revisions(&revs
, NULL
);
1080 setup_revisions(2, argv
+ i
- 1, &revs
, NULL
);
1082 if (prepare_revision_walk(&revs
))
1083 die(_("revision walk setup failed\n"));
1084 while ((commit
= get_revision(&revs
)) != NULL
)
1085 strvec_push(&argv_state
,
1086 oid_to_hex(&commit
->object
.oid
));
1088 reset_revision_walk();
1089 release_revisions(&revs
);
1091 strvec_push(&argv_state
, argv
[i
]);
1094 res
= bisect_state(terms
, argv_state
.v
, argv_state
.nr
);
1096 strvec_clear(&argv_state
);
1100 static int bisect_visualize(struct bisect_terms
*terms
, const char **argv
, int argc
)
1102 struct child_process cmd
= CHILD_PROCESS_INIT
;
1103 struct strbuf sb
= STRBUF_INIT
;
1105 if (bisect_next_check(terms
, NULL
) != 0)
1106 return BISECT_FAILED
;
1110 if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") ||
1111 getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) {
1112 strvec_push(&cmd
.args
, "gitk");
1114 strvec_push(&cmd
.args
, "log");
1118 if (argv
[0][0] == '-') {
1119 strvec_push(&cmd
.args
, "log");
1121 } else if (strcmp(argv
[0], "tig") && !starts_with(argv
[0], "git"))
1124 strvec_pushv(&cmd
.args
, argv
);
1127 strvec_pushl(&cmd
.args
, "--bisect", "--", NULL
);
1129 strbuf_read_file(&sb
, git_path_bisect_names(), 0);
1130 sq_dequote_to_strvec(sb
.buf
, &cmd
.args
);
1131 strbuf_release(&sb
);
1133 return run_command(&cmd
);
1136 static int get_first_good(const char *refname UNUSED
,
1137 const struct object_id
*oid
,
1138 int flag UNUSED
, void *cb_data
)
1140 oidcpy(cb_data
, oid
);
1144 static int do_bisect_run(const char *command
)
1146 struct child_process cmd
= CHILD_PROCESS_INIT
;
1148 printf(_("running %s\n"), command
);
1150 strvec_push(&cmd
.args
, command
);
1151 return run_command(&cmd
);
1154 static int verify_good(const struct bisect_terms
*terms
, const char *command
)
1157 enum bisect_error res
;
1158 struct object_id good_rev
;
1159 struct object_id current_rev
;
1160 char *good_glob
= xstrfmt("%s-*", terms
->term_good
);
1161 int no_checkout
= ref_exists("BISECT_HEAD");
1163 for_each_glob_ref_in(get_first_good
, good_glob
, "refs/bisect/",
1167 if (read_ref(no_checkout
? "BISECT_HEAD" : "HEAD", ¤t_rev
))
1170 res
= bisect_checkout(&good_rev
, no_checkout
);
1171 if (res
!= BISECT_OK
)
1174 rc
= do_bisect_run(command
);
1176 res
= bisect_checkout(¤t_rev
, no_checkout
);
1177 if (res
!= BISECT_OK
)
1183 static int bisect_run(struct bisect_terms
*terms
, const char **argv
, int argc
)
1185 int res
= BISECT_OK
;
1186 struct strbuf command
= STRBUF_INIT
;
1187 const char *new_state
;
1188 int temporary_stdout_fd
, saved_stdout
;
1189 int is_first_run
= 1;
1191 if (bisect_next_check(terms
, NULL
))
1192 return BISECT_FAILED
;
1195 sq_quote_argv(&command
, argv
);
1197 error(_("bisect run failed: no command provided."));
1198 return BISECT_FAILED
;
1202 res
= do_bisect_run(command
.buf
);
1205 * Exit code 126 and 127 can either come from the shell
1206 * if it was unable to execute or even find the script,
1207 * or from the script itself. Check with a known-good
1208 * revision to avoid trashing the bisect run due to a
1209 * missing or non-executable script.
1211 if (is_first_run
&& (res
== 126 || res
== 127)) {
1212 int rc
= verify_good(terms
, command
.buf
);
1215 error(_("unable to verify '%s' on good"
1216 " revision"), command
.buf
);
1217 res
= BISECT_FAILED
;
1221 error(_("bogus exit code %d for good revision"),
1223 res
= BISECT_FAILED
;
1228 if (res
< 0 || 128 <= res
) {
1229 error(_("bisect run failed: exit code %d from"
1230 " '%s' is < 0 or >= 128"), res
, command
.buf
);
1237 new_state
= terms
->term_good
;
1239 new_state
= terms
->term_bad
;
1241 temporary_stdout_fd
= open(git_path_bisect_run(), O_CREAT
| O_WRONLY
| O_TRUNC
, 0666);
1243 if (temporary_stdout_fd
< 0) {
1244 res
= error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
1249 saved_stdout
= dup(1);
1250 dup2(temporary_stdout_fd
, 1);
1252 res
= bisect_state(terms
, &new_state
, 1);
1255 dup2(saved_stdout
, 1);
1256 close(saved_stdout
);
1257 close(temporary_stdout_fd
);
1259 print_file_to_stdout(git_path_bisect_run());
1261 if (res
== BISECT_ONLY_SKIPPED_LEFT
)
1262 error(_("bisect run cannot continue any more"));
1263 else if (res
== BISECT_INTERNAL_SUCCESS_MERGE_BASE
) {
1264 printf(_("bisect run success"));
1266 } else if (res
== BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
) {
1267 printf(_("bisect found first bad commit"));
1270 error(_("bisect run failed: 'git bisect--helper --bisect-state"
1271 " %s' exited with error code %d"), new_state
, res
);
1278 strbuf_release(&command
);
1282 static int cmd_bisect__reset(int argc
, const char **argv
, const char *prefix UNUSED
)
1285 return error(_("--bisect-reset requires either no argument or a commit"));
1286 return bisect_reset(argc
? argv
[0] : NULL
);
1289 static int cmd_bisect__terms(int argc
, const char **argv
, const char *prefix UNUSED
)
1292 struct bisect_terms terms
= { 0 };
1295 return error(_("--bisect-terms requires 0 or 1 argument"));
1296 res
= bisect_terms(&terms
, argc
== 1 ? argv
[0] : NULL
);
1301 static int cmd_bisect__start(int argc
, const char **argv
, const char *prefix UNUSED
)
1304 struct bisect_terms terms
= { 0 };
1306 set_terms(&terms
, "bad", "good");
1307 res
= bisect_start(&terms
, argv
, argc
);
1312 static int cmd_bisect__next(int argc
, const char **argv UNUSED
, const char *prefix
)
1315 struct bisect_terms terms
= { 0 };
1318 return error(_("--bisect-next requires 0 arguments"));
1320 res
= bisect_next(&terms
, prefix
);
1325 static int cmd_bisect__state(int argc
, const char **argv
, const char *prefix UNUSED
)
1328 struct bisect_terms terms
= { 0 };
1330 set_terms(&terms
, "bad", "good");
1332 res
= bisect_state(&terms
, argv
, argc
);
1337 static int cmd_bisect__log(int argc
, const char **argv UNUSED
, const char *prefix UNUSED
)
1340 return error(_("--bisect-log requires 0 arguments"));
1341 return bisect_log();
1344 static int cmd_bisect__replay(int argc
, const char **argv
, const char *prefix UNUSED
)
1347 struct bisect_terms terms
= { 0 };
1350 return error(_("no logfile given"));
1351 set_terms(&terms
, "bad", "good");
1352 res
= bisect_replay(&terms
, argv
[0]);
1357 static int cmd_bisect__skip(int argc
, const char **argv
, const char *prefix UNUSED
)
1360 struct bisect_terms terms
= { 0 };
1362 set_terms(&terms
, "bad", "good");
1364 res
= bisect_skip(&terms
, argv
, argc
);
1369 static int cmd_bisect__visualize(int argc
, const char **argv
, const char *prefix UNUSED
)
1372 struct bisect_terms terms
= { 0 };
1375 res
= bisect_visualize(&terms
, argv
, argc
);
1380 static int cmd_bisect__run(int argc
, const char **argv
, const char *prefix UNUSED
)
1383 struct bisect_terms terms
= { 0 };
1386 return error(_("bisect run failed: no command provided."));
1388 res
= bisect_run(&terms
, argv
, argc
);
1393 int cmd_bisect__helper(int argc
, const char **argv
, const char *prefix
)
1396 parse_opt_subcommand_fn
*fn
= NULL
;
1397 struct option options
[] = {
1398 OPT_SUBCOMMAND("reset", &fn
, cmd_bisect__reset
),
1399 OPT_SUBCOMMAND("terms", &fn
, cmd_bisect__terms
),
1400 OPT_SUBCOMMAND("start", &fn
, cmd_bisect__start
),
1401 OPT_SUBCOMMAND("next", &fn
, cmd_bisect__next
),
1402 OPT_SUBCOMMAND("state", &fn
, cmd_bisect__state
),
1403 OPT_SUBCOMMAND("log", &fn
, cmd_bisect__log
),
1404 OPT_SUBCOMMAND("replay", &fn
, cmd_bisect__replay
),
1405 OPT_SUBCOMMAND("skip", &fn
, cmd_bisect__skip
),
1406 OPT_SUBCOMMAND("visualize", &fn
, cmd_bisect__visualize
),
1407 OPT_SUBCOMMAND("view", &fn
, cmd_bisect__visualize
),
1408 OPT_SUBCOMMAND("run", &fn
, cmd_bisect__run
),
1411 argc
= parse_options(argc
, argv
, prefix
, options
,
1412 git_bisect_helper_usage
, 0);
1415 usage_with_options(git_bisect_helper_usage
, options
);
1419 res
= fn(argc
, argv
, prefix
);
1422 * Handle early success
1423 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
1425 if ((res
== BISECT_INTERNAL_SUCCESS_MERGE_BASE
) || (res
== BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
))