6 #include "list-objects.h"
8 #include "sha1-lookup.h"
9 #include "run-command.h"
12 #include "sha1-array.h"
13 #include "argv-array.h"
15 static struct sha1_array good_revs
;
16 static struct sha1_array skipped_revs
;
18 static struct object_id
*current_bad_oid
;
20 static const char *argv_checkout
[] = {"checkout", "-q", NULL
, "--", NULL
};
21 static const char *argv_show_branch
[] = {"show-branch", NULL
, NULL
};
23 static const char *term_bad
;
24 static const char *term_good
;
26 /* Remember to update object flag allocation in object.h */
27 #define COUNTED (1u<<16)
30 * This is a truly stupid algorithm, but it's only
31 * used for bisection, and we just don't care enough.
33 * We care just barely enough to avoid recursing for
36 static int count_distance(struct commit_list
*entry
)
41 struct commit
*commit
= entry
->item
;
42 struct commit_list
*p
;
44 if (commit
->object
.flags
& (UNINTERESTING
| COUNTED
))
46 if (!(commit
->object
.flags
& TREESAME
))
48 commit
->object
.flags
|= COUNTED
;
54 nr
+= count_distance(p
);
63 static void clear_distance(struct commit_list
*list
)
66 struct commit
*commit
= list
->item
;
67 commit
->object
.flags
&= ~COUNTED
;
72 #define DEBUG_BISECT 0
74 static inline int weight(struct commit_list
*elem
)
76 return *((int*)(elem
->item
->util
));
79 static inline void weight_set(struct commit_list
*elem
, int weight
)
81 *((int*)(elem
->item
->util
)) = weight
;
84 static int count_interesting_parents(struct commit
*commit
)
86 struct commit_list
*p
;
89 for (count
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
90 if (p
->item
->object
.flags
& UNINTERESTING
)
97 static inline int halfway(struct commit_list
*p
, int nr
)
100 * Don't short-cut something we are not going to return!
102 if (p
->item
->object
.flags
& TREESAME
)
107 * 2 and 3 are halfway of 5.
108 * 3 is halfway of 6 but 2 and 4 are not.
110 switch (2 * weight(p
) - nr
) {
111 case -1: case 0: case 1:
119 #define show_list(a,b,c,d) do { ; } while (0)
121 static void show_list(const char *debug
, int counted
, int nr
,
122 struct commit_list
*list
)
124 struct commit_list
*p
;
126 fprintf(stderr
, "%s (%d/%d)\n", debug
, counted
, nr
);
128 for (p
= list
; p
; p
= p
->next
) {
129 struct commit_list
*pp
;
130 struct commit
*commit
= p
->item
;
131 unsigned flags
= commit
->object
.flags
;
132 enum object_type type
;
134 char *buf
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
135 const char *subject_start
;
138 fprintf(stderr
, "%c%c%c ",
139 (flags
& TREESAME
) ? ' ' : 'T',
140 (flags
& UNINTERESTING
) ? 'U' : ' ',
141 (flags
& COUNTED
) ? 'C' : ' ');
143 fprintf(stderr
, "%3d", weight(p
));
145 fprintf(stderr
, "---");
146 fprintf(stderr
, " %.*s", 8, sha1_to_hex(commit
->object
.sha1
));
147 for (pp
= commit
->parents
; pp
; pp
= pp
->next
)
148 fprintf(stderr
, " %.*s", 8,
149 sha1_to_hex(pp
->item
->object
.sha1
));
151 subject_len
= find_commit_subject(buf
, &subject_start
);
153 fprintf(stderr
, " %.*s", subject_len
, subject_start
);
154 fprintf(stderr
, "\n");
157 #endif /* DEBUG_BISECT */
159 static struct commit_list
*best_bisection(struct commit_list
*list
, int nr
)
161 struct commit_list
*p
, *best
;
162 int best_distance
= -1;
165 for (p
= list
; p
; p
= p
->next
) {
167 unsigned flags
= p
->item
->object
.flags
;
169 if (flags
& TREESAME
)
171 distance
= weight(p
);
172 if (nr
- distance
< distance
)
173 distance
= nr
- distance
;
174 if (distance
> best_distance
) {
176 best_distance
= distance
;
184 struct commit
*commit
;
188 static int compare_commit_dist(const void *a_
, const void *b_
)
190 struct commit_dist
*a
, *b
;
192 a
= (struct commit_dist
*)a_
;
193 b
= (struct commit_dist
*)b_
;
194 if (a
->distance
!= b
->distance
)
195 return b
->distance
- a
->distance
; /* desc sort */
196 return oidcmp(&a
->commit
->object
.oid
, &b
->commit
->object
.oid
);
199 static struct commit_list
*best_bisection_sorted(struct commit_list
*list
, int nr
)
201 struct commit_list
*p
;
202 struct commit_dist
*array
= xcalloc(nr
, sizeof(*array
));
205 for (p
= list
, cnt
= 0; p
; p
= p
->next
) {
207 unsigned flags
= p
->item
->object
.flags
;
209 if (flags
& TREESAME
)
211 distance
= weight(p
);
212 if (nr
- distance
< distance
)
213 distance
= nr
- distance
;
214 array
[cnt
].commit
= p
->item
;
215 array
[cnt
].distance
= distance
;
218 QSORT(array
, cnt
, compare_commit_dist
);
219 for (p
= list
, i
= 0; i
< cnt
; i
++) {
220 char buf
[100]; /* enough for dist=%d */
221 struct object
*obj
= &(array
[i
].commit
->object
);
223 snprintf(buf
, sizeof(buf
), "dist=%d", array
[i
].distance
);
224 add_name_decoration(DECORATION_NONE
, buf
, obj
);
226 p
->item
= array
[i
].commit
;
236 * zero or positive weight is the number of interesting commits it can
237 * reach, including itself. Especially, weight = 0 means it does not
238 * reach any tree-changing commits (e.g. just above uninteresting one
239 * but traversal is with pathspec).
241 * weight = -1 means it has one parent and its distance is yet to
244 * weight = -2 means it has more than one parent and its distance is
245 * unknown. After running count_distance() first, they will get zero
246 * or positive distance.
248 static struct commit_list
*do_find_bisection(struct commit_list
*list
,
249 int nr
, int *weights
,
253 struct commit_list
*p
;
257 for (n
= 0, p
= list
; p
; p
= p
->next
) {
258 struct commit
*commit
= p
->item
;
259 unsigned flags
= commit
->object
.flags
;
261 p
->item
->util
= &weights
[n
++];
262 switch (count_interesting_parents(commit
)) {
264 if (!(flags
& TREESAME
)) {
267 show_list("bisection 2 count one",
271 * otherwise, it is known not to reach any
272 * tree-changing commit and gets weight 0.
284 show_list("bisection 2 initialize", counted
, nr
, list
);
287 * If you have only one parent in the resulting set
288 * then you can reach one commit more than that parent
289 * can reach. So we do not have to run the expensive
290 * count_distance() for single strand of pearls.
292 * However, if you have more than one parents, you cannot
293 * just add their distance and one for yourself, since
294 * they usually reach the same ancestor and you would
295 * end up counting them twice that way.
297 * So we will first count distance of merges the usual
298 * way, and then fill the blanks using cheaper algorithm.
300 for (p
= list
; p
; p
= p
->next
) {
301 if (p
->item
->object
.flags
& UNINTERESTING
)
305 weight_set(p
, count_distance(p
));
306 clear_distance(list
);
308 /* Does it happen to be at exactly half-way? */
309 if (!find_all
&& halfway(p
, nr
))
314 show_list("bisection 2 count_distance", counted
, nr
, list
);
316 while (counted
< nr
) {
317 for (p
= list
; p
; p
= p
->next
) {
318 struct commit_list
*q
;
319 unsigned flags
= p
->item
->object
.flags
;
323 for (q
= p
->item
->parents
; q
; q
= q
->next
) {
324 if (q
->item
->object
.flags
& UNINTERESTING
)
333 * weight for p is unknown but q is known.
334 * add one for p itself if p is to be counted,
335 * otherwise inherit it from q directly.
337 if (!(flags
& TREESAME
)) {
338 weight_set(p
, weight(q
)+1);
340 show_list("bisection 2 count one",
344 weight_set(p
, weight(q
));
346 /* Does it happen to be at exactly half-way? */
347 if (!find_all
&& halfway(p
, nr
))
352 show_list("bisection 2 counted all", counted
, nr
, list
);
355 return best_bisection(list
, nr
);
357 return best_bisection_sorted(list
, nr
);
360 struct commit_list
*find_bisection(struct commit_list
*list
,
361 int *reaches
, int *all
,
365 struct commit_list
*p
, *best
, *next
, *last
;
368 show_list("bisection 2 entry", 0, 0, list
);
371 * Count the number of total and tree-changing items on the
372 * list, while reversing the list.
374 for (nr
= on_list
= 0, last
= NULL
, p
= list
;
377 unsigned flags
= p
->item
->object
.flags
;
380 if (flags
& UNINTERESTING
)
384 if (!(flags
& TREESAME
))
389 show_list("bisection 2 sorted", 0, nr
, list
);
392 weights
= xcalloc(on_list
, sizeof(*weights
));
394 /* Do the real work of finding bisection commit. */
395 best
= do_find_bisection(list
, nr
, weights
, find_all
);
399 *reaches
= weight(best
);
405 static int register_ref(const char *refname
, const struct object_id
*oid
,
406 int flags
, void *cb_data
)
408 struct strbuf good_prefix
= STRBUF_INIT
;
409 strbuf_addstr(&good_prefix
, term_good
);
410 strbuf_addstr(&good_prefix
, "-");
412 if (!strcmp(refname
, term_bad
)) {
413 current_bad_oid
= xmalloc(sizeof(*current_bad_oid
));
414 oidcpy(current_bad_oid
, oid
);
415 } else if (starts_with(refname
, good_prefix
.buf
)) {
416 sha1_array_append(&good_revs
, oid
->hash
);
417 } else if (starts_with(refname
, "skip-")) {
418 sha1_array_append(&skipped_revs
, oid
->hash
);
421 strbuf_release(&good_prefix
);
426 static int read_bisect_refs(void)
428 return for_each_ref_in("refs/bisect/", register_ref
, NULL
);
431 static GIT_PATH_FUNC(git_path_bisect_names
, "BISECT_NAMES")
432 static GIT_PATH_FUNC(git_path_bisect_expected_rev
, "BISECT_EXPECTED_REV")
433 static GIT_PATH_FUNC(git_path_bisect_terms
, "BISECT_TERMS")
435 static void read_bisect_paths(struct argv_array
*array
)
437 struct strbuf str
= STRBUF_INIT
;
438 const char *filename
= git_path_bisect_names();
439 FILE *fp
= fopen(filename
, "r");
442 die_errno(_("Could not open file '%s'"), filename
);
444 while (strbuf_getline_lf(&str
, fp
) != EOF
) {
446 if (sq_dequote_to_argv_array(str
.buf
, array
))
447 die(_("Badly quoted content in file '%s': %s"),
451 strbuf_release(&str
);
455 static char *join_sha1_array_hex(struct sha1_array
*array
, char delim
)
457 struct strbuf joined_hexs
= STRBUF_INIT
;
460 for (i
= 0; i
< array
->nr
; i
++) {
461 strbuf_addstr(&joined_hexs
, sha1_to_hex(array
->sha1
[i
]));
462 if (i
+ 1 < array
->nr
)
463 strbuf_addch(&joined_hexs
, delim
);
466 return strbuf_detach(&joined_hexs
, NULL
);
470 * In this function, passing a not NULL skipped_first is very special.
471 * It means that we want to know if the first commit in the list is
472 * skipped because we will want to test a commit away from it if it is
474 * So if the first commit is skipped, we cannot take the shortcut to
475 * just "return list" when we find the first non skipped commit, we
476 * have to return a fully filtered list.
478 * We use (*skipped_first == -1) to mean "it has been found that the
479 * first commit is not skipped". In this case *skipped_first is set back
480 * to 0 just before the function returns.
482 struct commit_list
*filter_skipped(struct commit_list
*list
,
483 struct commit_list
**tried
,
488 struct commit_list
*filtered
= NULL
, **f
= &filtered
;
497 if (!skipped_revs
.nr
)
501 struct commit_list
*next
= list
->next
;
503 if (0 <= sha1_array_lookup(&skipped_revs
,
504 list
->item
->object
.oid
.hash
)) {
505 if (skipped_first
&& !*skipped_first
)
507 /* Move current to tried list */
512 if (!skipped_first
|| !*skipped_first
)
514 } else if (skipped_first
&& !*skipped_first
) {
515 /* This means we know it's not skipped */
518 /* Move current to filtered list */
527 if (skipped_first
&& *skipped_first
== -1)
533 #define PRN_MODULO 32768
536 * This is a pseudo random number generator based on "man 3 rand".
537 * It is not used properly because the seed is the argument and it
538 * is increased by one between each call, but that should not matter
539 * for this application.
541 static unsigned get_prn(unsigned count
) {
542 count
= count
* 1103515245 + 12345;
543 return (count
/65536) % PRN_MODULO
;
547 * Custom integer square root from
548 * http://en.wikipedia.org/wiki/Integer_square_root
550 static int sqrti(int val
)
558 float y
= (x
+ (float)val
/ x
) / 2;
559 d
= (y
> x
) ? y
- x
: x
- y
;
566 static struct commit_list
*skip_away(struct commit_list
*list
, int count
)
568 struct commit_list
*cur
, *previous
;
571 prn
= get_prn(count
);
572 index
= (count
* prn
/ PRN_MODULO
) * sqrti(prn
) / sqrti(PRN_MODULO
);
577 for (i
= 0; cur
; cur
= cur
->next
, i
++) {
579 if (oidcmp(&cur
->item
->object
.oid
, current_bad_oid
))
591 static struct commit_list
*managed_skipped(struct commit_list
*list
,
592 struct commit_list
**tried
)
594 int count
, skipped_first
;
598 if (!skipped_revs
.nr
)
601 list
= filter_skipped(list
, tried
, 0, &count
, &skipped_first
);
606 return skip_away(list
, count
);
609 static void bisect_rev_setup(struct rev_info
*revs
, const char *prefix
,
610 const char *bad_format
, const char *good_format
,
613 struct argv_array rev_argv
= ARGV_ARRAY_INIT
;
616 init_revisions(revs
, prefix
);
618 revs
->commit_format
= CMIT_FMT_UNSPECIFIED
;
620 /* rev_argv.argv[0] will be ignored by setup_revisions */
621 argv_array_push(&rev_argv
, "bisect_rev_setup");
622 argv_array_pushf(&rev_argv
, bad_format
, oid_to_hex(current_bad_oid
));
623 for (i
= 0; i
< good_revs
.nr
; i
++)
624 argv_array_pushf(&rev_argv
, good_format
,
625 sha1_to_hex(good_revs
.sha1
[i
]));
626 argv_array_push(&rev_argv
, "--");
628 read_bisect_paths(&rev_argv
);
630 setup_revisions(rev_argv
.argc
, rev_argv
.argv
, revs
, NULL
);
631 /* XXX leak rev_argv, as "revs" may still be pointing to it */
634 static void bisect_common(struct rev_info
*revs
)
636 if (prepare_revision_walk(revs
))
637 die("revision walk setup failed");
638 if (revs
->tree_objects
)
639 mark_edges_uninteresting(revs
, NULL
);
642 static void exit_if_skipped_commits(struct commit_list
*tried
,
643 const struct object_id
*bad
)
648 printf("There are only 'skip'ped commits left to test.\n"
649 "The first %s commit could be any of:\n", term_bad
);
651 for ( ; tried
; tried
= tried
->next
)
652 printf("%s\n", oid_to_hex(&tried
->item
->object
.oid
));
655 printf("%s\n", oid_to_hex(bad
));
656 printf(_("We cannot bisect more!\n"));
660 static int is_expected_rev(const struct object_id
*oid
)
662 const char *filename
= git_path_bisect_expected_rev();
664 struct strbuf str
= STRBUF_INIT
;
668 if (stat(filename
, &st
) || !S_ISREG(st
.st_mode
))
671 fp
= fopen(filename
, "r");
675 if (strbuf_getline_lf(&str
, fp
) != EOF
)
676 res
= !strcmp(str
.buf
, oid_to_hex(oid
));
678 strbuf_release(&str
);
684 static int bisect_checkout(const unsigned char *bisect_rev
, int no_checkout
)
686 char bisect_rev_hex
[GIT_SHA1_HEXSZ
+ 1];
688 memcpy(bisect_rev_hex
, sha1_to_hex(bisect_rev
), GIT_SHA1_HEXSZ
+ 1);
689 update_ref(NULL
, "BISECT_EXPECTED_REV", bisect_rev
, NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
691 argv_checkout
[2] = bisect_rev_hex
;
693 update_ref(NULL
, "BISECT_HEAD", bisect_rev
, NULL
, 0, UPDATE_REFS_DIE_ON_ERR
);
696 res
= run_command_v_opt(argv_checkout
, RUN_GIT_CMD
);
701 argv_show_branch
[1] = bisect_rev_hex
;
702 return run_command_v_opt(argv_show_branch
, RUN_GIT_CMD
);
705 static struct commit
*get_commit_reference(const unsigned char *sha1
)
707 struct commit
*r
= lookup_commit_reference(sha1
);
709 die(_("Not a valid commit name %s"), sha1_to_hex(sha1
));
713 static struct commit
**get_bad_and_good_commits(int *rev_nr
)
718 ALLOC_ARRAY(rev
, 1 + good_revs
.nr
);
719 rev
[n
++] = get_commit_reference(current_bad_oid
->hash
);
720 for (i
= 0; i
< good_revs
.nr
; i
++)
721 rev
[n
++] = get_commit_reference(good_revs
.sha1
[i
]);
727 static void handle_bad_merge_base(void)
729 if (is_expected_rev(current_bad_oid
)) {
730 char *bad_hex
= oid_to_hex(current_bad_oid
);
731 char *good_hex
= join_sha1_array_hex(&good_revs
, ' ');
732 if (!strcmp(term_bad
, "bad") && !strcmp(term_good
, "good")) {
733 fprintf(stderr
, _("The merge base %s is bad.\n"
734 "This means the bug has been fixed "
735 "between %s and [%s].\n"),
736 bad_hex
, bad_hex
, good_hex
);
737 } else if (!strcmp(term_bad
, "new") && !strcmp(term_good
, "old")) {
738 fprintf(stderr
, _("The merge base %s is new.\n"
739 "The property has changed "
740 "between %s and [%s].\n"),
741 bad_hex
, bad_hex
, good_hex
);
743 fprintf(stderr
, _("The merge base %s is %s.\n"
744 "This means the first '%s' commit is "
745 "between %s and [%s].\n"),
746 bad_hex
, term_bad
, term_good
, bad_hex
, good_hex
);
751 fprintf(stderr
, _("Some %s revs are not ancestors of the %s rev.\n"
752 "git bisect cannot work properly in this case.\n"
753 "Maybe you mistook %s and %s revs?\n"),
754 term_good
, term_bad
, term_good
, term_bad
);
758 static void handle_skipped_merge_base(const unsigned char *mb
)
760 char *mb_hex
= sha1_to_hex(mb
);
761 char *bad_hex
= oid_to_hex(current_bad_oid
);
762 char *good_hex
= join_sha1_array_hex(&good_revs
, ' ');
764 warning(_("the merge base between %s and [%s] "
766 "So we cannot be sure the first %s commit is "
767 "between %s and %s.\n"
768 "We continue anyway."),
769 bad_hex
, good_hex
, term_bad
, mb_hex
, bad_hex
);
774 * "check_merge_bases" checks that merge bases are not "bad" (or "new").
776 * - If one is "bad" (or "new"), it means the user assumed something wrong
777 * and we must exit with a non 0 error code.
778 * - If one is "good" (or "old"), that's good, we have nothing to do.
779 * - If one is "skipped", we can't know but we should warn.
780 * - If we don't know, we should check it out and ask the user to test.
782 static void check_merge_bases(int no_checkout
)
784 struct commit_list
*result
;
786 struct commit
**rev
= get_bad_and_good_commits(&rev_nr
);
788 result
= get_merge_bases_many(rev
[0], rev_nr
- 1, rev
+ 1);
790 for (; result
; result
= result
->next
) {
791 const unsigned char *mb
= result
->item
->object
.oid
.hash
;
792 if (!hashcmp(mb
, current_bad_oid
->hash
)) {
793 handle_bad_merge_base();
794 } else if (0 <= sha1_array_lookup(&good_revs
, mb
)) {
796 } else if (0 <= sha1_array_lookup(&skipped_revs
, mb
)) {
797 handle_skipped_merge_base(mb
);
799 printf(_("Bisecting: a merge base must be tested\n"));
800 exit(bisect_checkout(mb
, no_checkout
));
805 free_commit_list(result
);
808 static int check_ancestors(const char *prefix
)
810 struct rev_info revs
;
811 struct object_array pending_copy
;
814 bisect_rev_setup(&revs
, prefix
, "^%s", "%s", 0);
816 /* Save pending objects, so they can be cleaned up later. */
817 pending_copy
= revs
.pending
;
818 revs
.leak_pending
= 1;
821 * bisect_common calls prepare_revision_walk right away, which
822 * (together with .leak_pending = 1) makes us the sole owner of
823 * the list of pending objects.
825 bisect_common(&revs
);
826 res
= (revs
.commits
!= NULL
);
828 /* Clean up objects used, as they will be reused. */
829 clear_commit_marks_for_object_array(&pending_copy
, ALL_REV_FLAGS
);
830 free(pending_copy
.objects
);
836 * "check_good_are_ancestors_of_bad" checks that all "good" revs are
837 * ancestor of the "bad" rev.
839 * If that's not the case, we need to check the merge bases.
840 * If a merge base must be tested by the user, its source code will be
841 * checked out to be tested by the user and we will exit.
843 static void check_good_are_ancestors_of_bad(const char *prefix
, int no_checkout
)
845 char *filename
= git_pathdup("BISECT_ANCESTORS_OK");
849 if (!current_bad_oid
)
850 die(_("a %s revision is needed"), term_bad
);
852 /* Check if file BISECT_ANCESTORS_OK exists. */
853 if (!stat(filename
, &st
) && S_ISREG(st
.st_mode
))
856 /* Bisecting with no good rev is ok. */
857 if (good_revs
.nr
== 0)
860 /* Check if all good revs are ancestor of the bad rev. */
861 if (check_ancestors(prefix
))
862 check_merge_bases(no_checkout
);
864 /* Create file BISECT_ANCESTORS_OK. */
865 fd
= open(filename
, O_CREAT
| O_TRUNC
| O_WRONLY
, 0600);
867 warning_errno(_("could not create file '%s'"),
876 * This does "git diff-tree --pretty COMMIT" without one fork+exec.
878 static void show_diff_tree(const char *prefix
, struct commit
*commit
)
883 init_revisions(&opt
, prefix
);
884 git_config(git_diff_basic_config
, NULL
); /* no "diff" UI options */
888 /* This is what "--pretty" does */
889 opt
.verbose_header
= 1;
890 opt
.use_terminator
= 0;
891 opt
.commit_format
= CMIT_FMT_DEFAULT
;
894 if (!opt
.diffopt
.output_format
)
895 opt
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
897 setup_revisions(0, NULL
, &opt
, NULL
);
898 log_tree_commit(&opt
, commit
);
902 * The terms used for this bisect session are stored in BISECT_TERMS.
903 * We read them and store them to adapt the messages accordingly.
904 * Default is bad/good.
906 void read_bisect_terms(const char **read_bad
, const char **read_good
)
908 struct strbuf str
= STRBUF_INIT
;
909 const char *filename
= git_path_bisect_terms();
910 FILE *fp
= fopen(filename
, "r");
913 if (errno
== ENOENT
) {
918 die_errno(_("could not read file '%s'"), filename
);
921 strbuf_getline_lf(&str
, fp
);
922 *read_bad
= strbuf_detach(&str
, NULL
);
923 strbuf_getline_lf(&str
, fp
);
924 *read_good
= strbuf_detach(&str
, NULL
);
926 strbuf_release(&str
);
931 * We use the convention that exiting with an exit code 10 means that
932 * the bisection process finished successfully.
933 * In this case the calling shell script should exit 0.
935 * If no_checkout is non-zero, the bisection process does not
936 * checkout the trial commit but instead simply updates BISECT_HEAD.
938 int bisect_next_all(const char *prefix
, int no_checkout
)
940 struct rev_info revs
;
941 struct commit_list
*tried
;
942 int reaches
= 0, all
= 0, nr
, steps
;
943 const unsigned char *bisect_rev
;
946 read_bisect_terms(&term_bad
, &term_good
);
947 if (read_bisect_refs())
948 die(_("reading bisect refs failed"));
950 check_good_are_ancestors_of_bad(prefix
, no_checkout
);
952 bisect_rev_setup(&revs
, prefix
, "%s", "^%s", 1);
955 bisect_common(&revs
);
957 revs
.commits
= find_bisection(revs
.commits
, &reaches
, &all
,
959 revs
.commits
= managed_skipped(revs
.commits
, &tried
);
963 * We should exit here only if the "bad"
964 * commit is also a "skip" commit.
966 exit_if_skipped_commits(tried
, NULL
);
968 printf(_("%s was both %s and %s\n"),
969 oid_to_hex(current_bad_oid
),
976 fprintf(stderr
, _("No testable commit found.\n"
977 "Maybe you started with bad path parameters?\n"));
981 bisect_rev
= revs
.commits
->item
->object
.oid
.hash
;
983 if (!hashcmp(bisect_rev
, current_bad_oid
->hash
)) {
984 exit_if_skipped_commits(tried
, current_bad_oid
);
985 printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev
),
987 show_diff_tree(prefix
, revs
.commits
->item
);
988 /* This means the bisection process succeeded. */
992 nr
= all
- reaches
- 1;
993 steps
= estimate_bisect_steps(all
);
995 steps_msg
= xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
997 /* TRANSLATORS: the last %s will be replaced with
998 "(roughly %d steps)" translation */
999 printf(Q_("Bisecting: %d revision left to test after this %s\n",
1000 "Bisecting: %d revisions left to test after this %s\n",
1001 nr
), nr
, steps_msg
);
1004 return bisect_checkout(bisect_rev
, no_checkout
);
1007 static inline int log2i(int n
)
1011 for (; n
> 1; n
>>= 1)
1017 static inline int exp2i(int n
)
1023 * Estimate the number of bisect steps left (after the current step)
1025 * For any x between 0 included and 2^n excluded, the probability for
1026 * n - 1 steps left looks like:
1028 * P(2^n + x) == (2^n - x) / (2^n + x)
1030 * and P(2^n + x) < 0.5 means 2^n < 3x
1032 int estimate_bisect_steps(int all
)
1043 return (e
< 3 * x
) ? n
: n
- 1;