2009-03-26 05:55:24 +01:00
|
|
|
#include "cache.h"
|
2017-06-14 20:07:36 +02:00
|
|
|
#include "config.h"
|
2009-03-26 05:55:24 +01:00
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2009-03-26 05:55:54 +01:00
|
|
|
#include "refs.h"
|
|
|
|
#include "list-objects.h"
|
2009-03-26 05:55:59 +01:00
|
|
|
#include "quote.h"
|
2009-04-04 22:59:36 +02:00
|
|
|
#include "sha1-lookup.h"
|
2009-04-19 11:56:07 +02:00
|
|
|
#include "run-command.h"
|
2009-05-28 23:21:16 +02:00
|
|
|
#include "log-tree.h"
|
2009-03-26 05:55:24 +01:00
|
|
|
#include "bisect.h"
|
2011-05-19 23:34:33 +02:00
|
|
|
#include "sha1-array.h"
|
2011-09-13 23:58:14 +02:00
|
|
|
#include "argv-array.h"
|
2009-05-09 17:55:38 +02:00
|
|
|
|
2017-03-31 03:40:00 +02:00
|
|
|
static struct oid_array good_revs;
|
|
|
|
static struct oid_array skipped_revs;
|
2009-03-26 05:55:54 +01:00
|
|
|
|
2015-03-14 00:39:29 +01:00
|
|
|
static struct object_id *current_bad_oid;
|
2009-04-19 11:56:07 +02:00
|
|
|
|
|
|
|
static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
|
|
|
|
static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
|
|
|
|
|
2015-06-29 17:40:29 +02:00
|
|
|
static const char *term_bad;
|
|
|
|
static const char *term_good;
|
|
|
|
|
2014-03-25 14:23:26 +01:00
|
|
|
/* Remember to update object flag allocation in object.h */
|
2009-03-26 05:55:24 +01:00
|
|
|
#define COUNTED (1u<<16)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a truly stupid algorithm, but it's only
|
|
|
|
* used for bisection, and we just don't care enough.
|
|
|
|
*
|
|
|
|
* We care just barely enough to avoid recursing for
|
|
|
|
* non-merge entries.
|
|
|
|
*/
|
|
|
|
static int count_distance(struct commit_list *entry)
|
|
|
|
{
|
|
|
|
int nr = 0;
|
|
|
|
|
|
|
|
while (entry) {
|
|
|
|
struct commit *commit = entry->item;
|
|
|
|
struct commit_list *p;
|
|
|
|
|
|
|
|
if (commit->object.flags & (UNINTERESTING | COUNTED))
|
|
|
|
break;
|
|
|
|
if (!(commit->object.flags & TREESAME))
|
|
|
|
nr++;
|
|
|
|
commit->object.flags |= COUNTED;
|
|
|
|
p = commit->parents;
|
|
|
|
entry = p;
|
|
|
|
if (p) {
|
|
|
|
p = p->next;
|
|
|
|
while (p) {
|
|
|
|
nr += count_distance(p);
|
|
|
|
p = p->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void clear_distance(struct commit_list *list)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
struct commit *commit = list->item;
|
|
|
|
commit->object.flags &= ~COUNTED;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DEBUG_BISECT 0
|
|
|
|
|
|
|
|
static inline int weight(struct commit_list *elem)
|
|
|
|
{
|
|
|
|
return *((int*)(elem->item->util));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void weight_set(struct commit_list *elem, int weight)
|
|
|
|
{
|
|
|
|
*((int*)(elem->item->util)) = weight;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int count_interesting_parents(struct commit *commit)
|
|
|
|
{
|
|
|
|
struct commit_list *p;
|
|
|
|
int count;
|
|
|
|
|
|
|
|
for (count = 0, p = commit->parents; p; p = p->next) {
|
|
|
|
if (p->item->object.flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int halfway(struct commit_list *p, int nr)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Don't short-cut something we are not going to return!
|
|
|
|
*/
|
|
|
|
if (p->item->object.flags & TREESAME)
|
|
|
|
return 0;
|
|
|
|
if (DEBUG_BISECT)
|
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* 2 and 3 are halfway of 5.
|
|
|
|
* 3 is halfway of 6 but 2 and 4 are not.
|
|
|
|
*/
|
|
|
|
switch (2 * weight(p) - nr) {
|
|
|
|
case -1: case 0: case 1:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !DEBUG_BISECT
|
|
|
|
#define show_list(a,b,c,d) do { ; } while (0)
|
|
|
|
#else
|
|
|
|
static void show_list(const char *debug, int counted, int nr,
|
|
|
|
struct commit_list *list)
|
|
|
|
{
|
|
|
|
struct commit_list *p;
|
|
|
|
|
|
|
|
fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
|
|
|
|
|
|
|
|
for (p = list; p; p = p->next) {
|
|
|
|
struct commit_list *pp;
|
|
|
|
struct commit *commit = p->item;
|
|
|
|
unsigned flags = commit->object.flags;
|
|
|
|
enum object_type type;
|
|
|
|
unsigned long size;
|
|
|
|
char *buf = read_sha1_file(commit->object.sha1, &type, &size);
|
2010-07-22 15:18:33 +02:00
|
|
|
const char *subject_start;
|
|
|
|
int subject_len;
|
2009-03-26 05:55:24 +01:00
|
|
|
|
|
|
|
fprintf(stderr, "%c%c%c ",
|
|
|
|
(flags & TREESAME) ? ' ' : 'T',
|
|
|
|
(flags & UNINTERESTING) ? 'U' : ' ',
|
|
|
|
(flags & COUNTED) ? 'C' : ' ');
|
|
|
|
if (commit->util)
|
|
|
|
fprintf(stderr, "%3d", weight(p));
|
|
|
|
else
|
|
|
|
fprintf(stderr, "---");
|
|
|
|
fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
|
|
|
|
for (pp = commit->parents; pp; pp = pp->next)
|
|
|
|
fprintf(stderr, " %.*s", 8,
|
|
|
|
sha1_to_hex(pp->item->object.sha1));
|
|
|
|
|
2010-07-22 15:18:33 +02:00
|
|
|
subject_len = find_commit_subject(buf, &subject_start);
|
|
|
|
if (subject_len)
|
|
|
|
fprintf(stderr, " %.*s", subject_len, subject_start);
|
2009-03-26 05:55:24 +01:00
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* DEBUG_BISECT */
|
|
|
|
|
|
|
|
static struct commit_list *best_bisection(struct commit_list *list, int nr)
|
|
|
|
{
|
|
|
|
struct commit_list *p, *best;
|
|
|
|
int best_distance = -1;
|
|
|
|
|
|
|
|
best = list;
|
|
|
|
for (p = list; p; p = p->next) {
|
|
|
|
int distance;
|
|
|
|
unsigned flags = p->item->object.flags;
|
|
|
|
|
|
|
|
if (flags & TREESAME)
|
|
|
|
continue;
|
|
|
|
distance = weight(p);
|
|
|
|
if (nr - distance < distance)
|
|
|
|
distance = nr - distance;
|
|
|
|
if (distance > best_distance) {
|
|
|
|
best = p;
|
|
|
|
best_distance = distance;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return best;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct commit_dist {
|
|
|
|
struct commit *commit;
|
|
|
|
int distance;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int compare_commit_dist(const void *a_, const void *b_)
|
|
|
|
{
|
|
|
|
struct commit_dist *a, *b;
|
|
|
|
|
|
|
|
a = (struct commit_dist *)a_;
|
|
|
|
b = (struct commit_dist *)b_;
|
|
|
|
if (a->distance != b->distance)
|
|
|
|
return b->distance - a->distance; /* desc sort */
|
2015-11-10 03:22:28 +01:00
|
|
|
return oidcmp(&a->commit->object.oid, &b->commit->object.oid);
|
2009-03-26 05:55:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct commit_list *best_bisection_sorted(struct commit_list *list, int nr)
|
|
|
|
{
|
|
|
|
struct commit_list *p;
|
|
|
|
struct commit_dist *array = xcalloc(nr, sizeof(*array));
|
2017-03-28 21:46:50 +02:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2009-03-26 05:55:24 +01:00
|
|
|
int cnt, i;
|
|
|
|
|
|
|
|
for (p = list, cnt = 0; p; p = p->next) {
|
|
|
|
int distance;
|
|
|
|
unsigned flags = p->item->object.flags;
|
|
|
|
|
|
|
|
if (flags & TREESAME)
|
|
|
|
continue;
|
|
|
|
distance = weight(p);
|
|
|
|
if (nr - distance < distance)
|
|
|
|
distance = nr - distance;
|
|
|
|
array[cnt].commit = p->item;
|
|
|
|
array[cnt].distance = distance;
|
|
|
|
cnt++;
|
|
|
|
}
|
2016-09-29 17:27:31 +02:00
|
|
|
QSORT(array, cnt, compare_commit_dist);
|
2009-03-26 05:55:24 +01:00
|
|
|
for (p = list, i = 0; i < cnt; i++) {
|
|
|
|
struct object *obj = &(array[i].commit->object);
|
|
|
|
|
2017-03-28 21:46:50 +02:00
|
|
|
strbuf_reset(&buf);
|
|
|
|
strbuf_addf(&buf, "dist=%d", array[i].distance);
|
|
|
|
add_name_decoration(DECORATION_NONE, buf.buf, obj);
|
2014-08-26 12:23:36 +02:00
|
|
|
|
2009-03-26 05:55:24 +01:00
|
|
|
p->item = array[i].commit;
|
bisect: fix off-by-one error in `best_bisection_sorted()`
After we have sorted the `cnt`-many commits that we have selected, we
place them into the commit list. We then set `p->next` to NULL, but as
we do so, `p` is already pointing one beyond item number `cnt`. Indeed,
we check whether `p` is NULL before dereferencing it.
This only matters if there are TREESAME-commits. Since they should be
skipped, they are not included in `cnt` and we will hit the situation
where we set `p->next` to NULL. As a result, the list will be one longer
than it should be. The last commit in the list will be one which occurs
earlier, or which shouldn't be included.
Do not update `p` the very last round in the loop. This ensures that
after the loop, `p->next` points to the remainder of the list, and we
can set it to NULL. While we're here, free that remainder to fix a
memory leak.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-11-05 21:24:30 +01:00
|
|
|
if (i < cnt - 1)
|
|
|
|
p = p->next;
|
2009-03-26 05:55:24 +01:00
|
|
|
}
|
2018-01-03 19:48:52 +01:00
|
|
|
if (p) {
|
|
|
|
free_commit_list(p->next);
|
|
|
|
p->next = NULL;
|
|
|
|
}
|
2017-03-28 21:46:50 +02:00
|
|
|
strbuf_release(&buf);
|
2009-03-26 05:55:24 +01:00
|
|
|
free(array);
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* zero or positive weight is the number of interesting commits it can
|
|
|
|
* reach, including itself. Especially, weight = 0 means it does not
|
|
|
|
* reach any tree-changing commits (e.g. just above uninteresting one
|
|
|
|
* but traversal is with pathspec).
|
|
|
|
*
|
|
|
|
* weight = -1 means it has one parent and its distance is yet to
|
|
|
|
* be computed.
|
|
|
|
*
|
|
|
|
* weight = -2 means it has more than one parent and its distance is
|
|
|
|
* unknown. After running count_distance() first, they will get zero
|
|
|
|
* or positive distance.
|
|
|
|
*/
|
|
|
|
static struct commit_list *do_find_bisection(struct commit_list *list,
|
|
|
|
int nr, int *weights,
|
|
|
|
int find_all)
|
|
|
|
{
|
|
|
|
int n, counted;
|
|
|
|
struct commit_list *p;
|
|
|
|
|
|
|
|
counted = 0;
|
|
|
|
|
|
|
|
for (n = 0, p = list; p; p = p->next) {
|
|
|
|
struct commit *commit = p->item;
|
|
|
|
unsigned flags = commit->object.flags;
|
|
|
|
|
|
|
|
p->item->util = &weights[n++];
|
|
|
|
switch (count_interesting_parents(commit)) {
|
|
|
|
case 0:
|
|
|
|
if (!(flags & TREESAME)) {
|
|
|
|
weight_set(p, 1);
|
|
|
|
counted++;
|
|
|
|
show_list("bisection 2 count one",
|
|
|
|
counted, nr, list);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* otherwise, it is known not to reach any
|
|
|
|
* tree-changing commit and gets weight 0.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
weight_set(p, -1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
weight_set(p, -2);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
show_list("bisection 2 initialize", counted, nr, list);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If you have only one parent in the resulting set
|
|
|
|
* then you can reach one commit more than that parent
|
|
|
|
* can reach. So we do not have to run the expensive
|
|
|
|
* count_distance() for single strand of pearls.
|
|
|
|
*
|
|
|
|
* However, if you have more than one parents, you cannot
|
|
|
|
* just add their distance and one for yourself, since
|
|
|
|
* they usually reach the same ancestor and you would
|
|
|
|
* end up counting them twice that way.
|
|
|
|
*
|
|
|
|
* So we will first count distance of merges the usual
|
|
|
|
* way, and then fill the blanks using cheaper algorithm.
|
|
|
|
*/
|
|
|
|
for (p = list; p; p = p->next) {
|
|
|
|
if (p->item->object.flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
if (weight(p) != -2)
|
|
|
|
continue;
|
|
|
|
weight_set(p, count_distance(p));
|
|
|
|
clear_distance(list);
|
|
|
|
|
|
|
|
/* Does it happen to be at exactly half-way? */
|
|
|
|
if (!find_all && halfway(p, nr))
|
|
|
|
return p;
|
|
|
|
counted++;
|
|
|
|
}
|
|
|
|
|
|
|
|
show_list("bisection 2 count_distance", counted, nr, list);
|
|
|
|
|
|
|
|
while (counted < nr) {
|
|
|
|
for (p = list; p; p = p->next) {
|
|
|
|
struct commit_list *q;
|
|
|
|
unsigned flags = p->item->object.flags;
|
|
|
|
|
|
|
|
if (0 <= weight(p))
|
|
|
|
continue;
|
|
|
|
for (q = p->item->parents; q; q = q->next) {
|
|
|
|
if (q->item->object.flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
if (0 <= weight(q))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!q)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* weight for p is unknown but q is known.
|
|
|
|
* add one for p itself if p is to be counted,
|
|
|
|
* otherwise inherit it from q directly.
|
|
|
|
*/
|
|
|
|
if (!(flags & TREESAME)) {
|
|
|
|
weight_set(p, weight(q)+1);
|
|
|
|
counted++;
|
|
|
|
show_list("bisection 2 count one",
|
|
|
|
counted, nr, list);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
weight_set(p, weight(q));
|
|
|
|
|
|
|
|
/* Does it happen to be at exactly half-way? */
|
|
|
|
if (!find_all && halfway(p, nr))
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
show_list("bisection 2 counted all", counted, nr, list);
|
|
|
|
|
|
|
|
if (!find_all)
|
|
|
|
return best_bisection(list, nr);
|
|
|
|
else
|
|
|
|
return best_bisection_sorted(list, nr);
|
|
|
|
}
|
|
|
|
|
2017-11-05 21:24:28 +01:00
|
|
|
void find_bisection(struct commit_list **commit_list, int *reaches,
|
|
|
|
int *all, int find_all)
|
2009-03-26 05:55:24 +01:00
|
|
|
{
|
|
|
|
int nr, on_list;
|
2017-11-05 21:24:28 +01:00
|
|
|
struct commit_list *list, *p, *best, *next, *last;
|
2009-03-26 05:55:24 +01:00
|
|
|
int *weights;
|
|
|
|
|
2017-11-05 21:24:28 +01:00
|
|
|
show_list("bisection 2 entry", 0, 0, *commit_list);
|
2009-03-26 05:55:24 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Count the number of total and tree-changing items on the
|
|
|
|
* list, while reversing the list.
|
|
|
|
*/
|
2017-11-05 21:24:28 +01:00
|
|
|
for (nr = on_list = 0, last = NULL, p = *commit_list;
|
2009-03-26 05:55:24 +01:00
|
|
|
p;
|
|
|
|
p = next) {
|
|
|
|
unsigned flags = p->item->object.flags;
|
|
|
|
|
|
|
|
next = p->next;
|
2017-11-05 21:24:29 +01:00
|
|
|
if (flags & UNINTERESTING) {
|
|
|
|
free(p);
|
2009-03-26 05:55:24 +01:00
|
|
|
continue;
|
2017-11-05 21:24:29 +01:00
|
|
|
}
|
2009-03-26 05:55:24 +01:00
|
|
|
p->next = last;
|
|
|
|
last = p;
|
|
|
|
if (!(flags & TREESAME))
|
|
|
|
nr++;
|
|
|
|
on_list++;
|
|
|
|
}
|
|
|
|
list = last;
|
|
|
|
show_list("bisection 2 sorted", 0, nr, list);
|
|
|
|
|
|
|
|
*all = nr;
|
|
|
|
weights = xcalloc(on_list, sizeof(*weights));
|
|
|
|
|
|
|
|
/* Do the real work of finding bisection commit. */
|
|
|
|
best = do_find_bisection(list, nr, weights, find_all);
|
|
|
|
if (best) {
|
2017-11-05 21:24:31 +01:00
|
|
|
if (!find_all) {
|
|
|
|
list->item = best->item;
|
|
|
|
free_commit_list(list->next);
|
|
|
|
best = list;
|
2009-03-26 05:55:24 +01:00
|
|
|
best->next = NULL;
|
2017-11-05 21:24:31 +01:00
|
|
|
}
|
2009-03-26 05:55:24 +01:00
|
|
|
*reaches = weight(best);
|
|
|
|
}
|
|
|
|
free(weights);
|
2017-11-05 21:24:28 +01:00
|
|
|
*commit_list = best;
|
2009-03-26 05:55:24 +01:00
|
|
|
}
|
|
|
|
|
2015-05-25 20:38:31 +02:00
|
|
|
static int register_ref(const char *refname, const struct object_id *oid,
|
2009-03-26 05:55:54 +01:00
|
|
|
int flags, void *cb_data)
|
|
|
|
{
|
2015-06-29 17:40:29 +02:00
|
|
|
struct strbuf good_prefix = STRBUF_INIT;
|
|
|
|
strbuf_addstr(&good_prefix, term_good);
|
|
|
|
strbuf_addstr(&good_prefix, "-");
|
|
|
|
|
|
|
|
if (!strcmp(refname, term_bad)) {
|
2015-03-14 00:39:29 +01:00
|
|
|
current_bad_oid = xmalloc(sizeof(*current_bad_oid));
|
2015-05-25 20:38:31 +02:00
|
|
|
oidcpy(current_bad_oid, oid);
|
2015-06-29 17:40:29 +02:00
|
|
|
} else if (starts_with(refname, good_prefix.buf)) {
|
2017-03-31 03:40:00 +02:00
|
|
|
oid_array_append(&good_revs, oid);
|
2013-11-30 21:55:40 +01:00
|
|
|
} else if (starts_with(refname, "skip-")) {
|
2017-03-31 03:40:00 +02:00
|
|
|
oid_array_append(&skipped_revs, oid);
|
2009-03-26 05:55:54 +01:00
|
|
|
}
|
|
|
|
|
2015-06-29 17:40:29 +02:00
|
|
|
strbuf_release(&good_prefix);
|
|
|
|
|
2009-03-26 05:55:54 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int read_bisect_refs(void)
|
|
|
|
{
|
2015-05-25 20:38:31 +02:00
|
|
|
return for_each_ref_in("refs/bisect/", register_ref, NULL);
|
2009-03-26 05:55:54 +01:00
|
|
|
}
|
|
|
|
|
memoize common git-path "constant" files
One of the most common uses of git_path() is to pass a
constant, like git_path("MERGE_MSG"). This has two
drawbacks:
1. The return value is a static buffer, and the lifetime
is dependent on other calls to git_path, etc.
2. There's no compile-time checking of the pathname. This
is OK for a one-off (after all, we have to spell it
correctly at least once), but many of these constant
strings appear throughout the code.
This patch introduces a series of functions to "memoize"
these strings, which are essentially globals for the
lifetime of the program. We compute the value once, take
ownership of the buffer, and return the cached value for
subsequent calls. cache.h provides a helper macro for
defining these functions as one-liners, and defines a few
common ones for global use.
Using a macro is a little bit gross, but it does nicely
document the purpose of the functions. If we need to touch
them all later (e.g., because we learned how to change the
git_dir variable at runtime, and need to invalidate all of
the stored values), it will be much easier to have the
complete list.
Note that the shared-global functions have separate, manual
declarations. We could do something clever with the macros
(e.g., expand it to a declaration in some places, and a
declaration _and_ a definition in path.c). But there aren't
that many, and it's probably better to stay away from
too-magical macros.
Likewise, if we abandon the C preprocessor in favor of
generating these with a script, we could get much fancier.
E.g., normalizing "FOO/BAR-BAZ" into "git_path_foo_bar_baz".
But the small amount of saved typing is probably not worth
the resulting confusion to readers who want to grep for the
function's definition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-10 11:38:57 +02:00
|
|
|
static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
|
|
|
|
static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
|
2017-09-29 08:49:39 +02:00
|
|
|
static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
|
|
|
|
static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
|
|
|
|
static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
|
|
|
|
static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
|
2017-04-20 23:08:25 +02:00
|
|
|
static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
|
2017-09-29 08:49:39 +02:00
|
|
|
static GIT_PATH_FUNC(git_path_head_name, "head-name")
|
memoize common git-path "constant" files
One of the most common uses of git_path() is to pass a
constant, like git_path("MERGE_MSG"). This has two
drawbacks:
1. The return value is a static buffer, and the lifetime
is dependent on other calls to git_path, etc.
2. There's no compile-time checking of the pathname. This
is OK for a one-off (after all, we have to spell it
correctly at least once), but many of these constant
strings appear throughout the code.
This patch introduces a series of functions to "memoize"
these strings, which are essentially globals for the
lifetime of the program. We compute the value once, take
ownership of the buffer, and return the cached value for
subsequent calls. cache.h provides a helper macro for
defining these functions as one-liners, and defines a few
common ones for global use.
Using a macro is a little bit gross, but it does nicely
document the purpose of the functions. If we need to touch
them all later (e.g., because we learned how to change the
git_dir variable at runtime, and need to invalidate all of
the stored values), it will be much easier to have the
complete list.
Note that the shared-global functions have separate, manual
declarations. We could do something clever with the macros
(e.g., expand it to a declaration in some places, and a
declaration _and_ a definition in path.c). But there aren't
that many, and it's probably better to stay away from
too-magical macros.
Likewise, if we abandon the C preprocessor in favor of
generating these with a script, we could get much fancier.
E.g., normalizing "FOO/BAR-BAZ" into "git_path_foo_bar_baz".
But the small amount of saved typing is probably not worth
the resulting confusion to readers who want to grep for the
function's definition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-10 11:38:57 +02:00
|
|
|
|
2009-06-18 19:28:43 +02:00
|
|
|
static void read_bisect_paths(struct argv_array *array)
|
2009-03-26 05:55:59 +01:00
|
|
|
{
|
|
|
|
struct strbuf str = STRBUF_INIT;
|
memoize common git-path "constant" files
One of the most common uses of git_path() is to pass a
constant, like git_path("MERGE_MSG"). This has two
drawbacks:
1. The return value is a static buffer, and the lifetime
is dependent on other calls to git_path, etc.
2. There's no compile-time checking of the pathname. This
is OK for a one-off (after all, we have to spell it
correctly at least once), but many of these constant
strings appear throughout the code.
This patch introduces a series of functions to "memoize"
these strings, which are essentially globals for the
lifetime of the program. We compute the value once, take
ownership of the buffer, and return the cached value for
subsequent calls. cache.h provides a helper macro for
defining these functions as one-liners, and defines a few
common ones for global use.
Using a macro is a little bit gross, but it does nicely
document the purpose of the functions. If we need to touch
them all later (e.g., because we learned how to change the
git_dir variable at runtime, and need to invalidate all of
the stored values), it will be much easier to have the
complete list.
Note that the shared-global functions have separate, manual
declarations. We could do something clever with the macros
(e.g., expand it to a declaration in some places, and a
declaration _and_ a definition in path.c). But there aren't
that many, and it's probably better to stay away from
too-magical macros.
Likewise, if we abandon the C preprocessor in favor of
generating these with a script, we could get much fancier.
E.g., normalizing "FOO/BAR-BAZ" into "git_path_foo_bar_baz".
But the small amount of saved typing is probably not worth
the resulting confusion to readers who want to grep for the
function's definition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-10 11:38:57 +02:00
|
|
|
const char *filename = git_path_bisect_names();
|
2017-05-03 12:16:46 +02:00
|
|
|
FILE *fp = xfopen(filename, "r");
|
2009-03-26 05:55:59 +01:00
|
|
|
|
2016-01-14 00:31:17 +01:00
|
|
|
while (strbuf_getline_lf(&str, fp) != EOF) {
|
2009-03-26 05:55:59 +01:00
|
|
|
strbuf_trim(&str);
|
2011-09-13 23:58:14 +02:00
|
|
|
if (sq_dequote_to_argv_array(str.buf, array))
|
2016-06-17 22:21:12 +02:00
|
|
|
die(_("Badly quoted content in file '%s': %s"),
|
2011-09-13 23:58:14 +02:00
|
|
|
filename, str.buf);
|
2009-03-26 05:55:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_release(&str);
|
|
|
|
fclose(fp);
|
|
|
|
}
|
|
|
|
|
2017-03-31 03:40:00 +02:00
|
|
|
static char *join_sha1_array_hex(struct oid_array *array, char delim)
|
2009-05-09 17:55:45 +02:00
|
|
|
{
|
|
|
|
struct strbuf joined_hexs = STRBUF_INIT;
|
|
|
|
int i;
|
|
|
|
|
2011-05-19 23:34:33 +02:00
|
|
|
for (i = 0; i < array->nr; i++) {
|
2017-03-26 18:01:37 +02:00
|
|
|
strbuf_addstr(&joined_hexs, oid_to_hex(array->oid + i));
|
2011-05-19 23:34:33 +02:00
|
|
|
if (i + 1 < array->nr)
|
2009-05-09 17:55:45 +02:00
|
|
|
strbuf_addch(&joined_hexs, delim);
|
|
|
|
}
|
|
|
|
|
|
|
|
return strbuf_detach(&joined_hexs, NULL);
|
|
|
|
}
|
|
|
|
|
2009-06-06 06:41:33 +02:00
|
|
|
/*
|
|
|
|
* In this function, passing a not NULL skipped_first is very special.
|
|
|
|
* It means that we want to know if the first commit in the list is
|
|
|
|
* skipped because we will want to test a commit away from it if it is
|
|
|
|
* indeed skipped.
|
|
|
|
* So if the first commit is skipped, we cannot take the shortcut to
|
|
|
|
* just "return list" when we find the first non skipped commit, we
|
|
|
|
* have to return a fully filtered list.
|
|
|
|
*
|
|
|
|
* We use (*skipped_first == -1) to mean "it has been found that the
|
|
|
|
* first commit is not skipped". In this case *skipped_first is set back
|
|
|
|
* to 0 just before the function returns.
|
|
|
|
*/
|
2009-03-26 05:55:49 +01:00
|
|
|
struct commit_list *filter_skipped(struct commit_list *list,
|
|
|
|
struct commit_list **tried,
|
2009-06-06 06:41:33 +02:00
|
|
|
int show_all,
|
|
|
|
int *count,
|
|
|
|
int *skipped_first)
|
2009-03-26 05:55:49 +01:00
|
|
|
{
|
|
|
|
struct commit_list *filtered = NULL, **f = &filtered;
|
|
|
|
|
|
|
|
*tried = NULL;
|
|
|
|
|
2009-06-06 06:41:33 +02:00
|
|
|
if (skipped_first)
|
|
|
|
*skipped_first = 0;
|
|
|
|
if (count)
|
|
|
|
*count = 0;
|
|
|
|
|
2011-05-19 23:34:33 +02:00
|
|
|
if (!skipped_revs.nr)
|
2009-03-26 05:55:49 +01:00
|
|
|
return list;
|
|
|
|
|
|
|
|
while (list) {
|
|
|
|
struct commit_list *next = list->next;
|
|
|
|
list->next = NULL;
|
2017-03-31 03:40:00 +02:00
|
|
|
if (0 <= oid_array_lookup(&skipped_revs, &list->item->object.oid)) {
|
2009-06-06 06:41:33 +02:00
|
|
|
if (skipped_first && !*skipped_first)
|
|
|
|
*skipped_first = 1;
|
2009-03-26 05:55:49 +01:00
|
|
|
/* Move current to tried list */
|
|
|
|
*tried = list;
|
|
|
|
tried = &list->next;
|
|
|
|
} else {
|
2009-06-06 06:41:33 +02:00
|
|
|
if (!show_all) {
|
|
|
|
if (!skipped_first || !*skipped_first)
|
|
|
|
return list;
|
|
|
|
} else if (skipped_first && !*skipped_first) {
|
|
|
|
/* This means we know it's not skipped */
|
|
|
|
*skipped_first = -1;
|
|
|
|
}
|
2009-03-26 05:55:49 +01:00
|
|
|
/* Move current to filtered list */
|
|
|
|
*f = list;
|
|
|
|
f = &list->next;
|
2009-06-06 06:41:33 +02:00
|
|
|
if (count)
|
|
|
|
(*count)++;
|
2009-03-26 05:55:49 +01:00
|
|
|
}
|
|
|
|
list = next;
|
|
|
|
}
|
|
|
|
|
2009-06-06 06:41:33 +02:00
|
|
|
if (skipped_first && *skipped_first == -1)
|
|
|
|
*skipped_first = 0;
|
|
|
|
|
2009-03-26 05:55:49 +01:00
|
|
|
return filtered;
|
|
|
|
}
|
2009-03-26 05:55:54 +01:00
|
|
|
|
2009-06-13 07:21:06 +02:00
|
|
|
#define PRN_MODULO 32768
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a pseudo random number generator based on "man 3 rand".
|
|
|
|
* It is not used properly because the seed is the argument and it
|
|
|
|
* is increased by one between each call, but that should not matter
|
|
|
|
* for this application.
|
|
|
|
*/
|
2013-04-03 21:17:55 +02:00
|
|
|
static unsigned get_prn(unsigned count) {
|
2009-06-13 07:21:06 +02:00
|
|
|
count = count * 1103515245 + 12345;
|
2013-04-03 21:17:55 +02:00
|
|
|
return (count/65536) % PRN_MODULO;
|
2009-06-13 07:21:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Custom integer square root from
|
2017-05-13 11:54:51 +02:00
|
|
|
* https://en.wikipedia.org/wiki/Integer_square_root
|
2009-06-13 07:21:06 +02:00
|
|
|
*/
|
|
|
|
static int sqrti(int val)
|
|
|
|
{
|
|
|
|
float d, x = val;
|
|
|
|
|
|
|
|
if (val == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
do {
|
|
|
|
float y = (x + (float)val / x) / 2;
|
|
|
|
d = (y > x) ? y - x : x - y;
|
|
|
|
x = y;
|
|
|
|
} while (d >= 0.5);
|
|
|
|
|
|
|
|
return (int)x;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commit_list *skip_away(struct commit_list *list, int count)
|
2009-06-06 06:41:34 +02:00
|
|
|
{
|
|
|
|
struct commit_list *cur, *previous;
|
2009-06-13 07:21:06 +02:00
|
|
|
int prn, index, i;
|
|
|
|
|
|
|
|
prn = get_prn(count);
|
|
|
|
index = (count * prn / PRN_MODULO) * sqrti(prn) / sqrti(PRN_MODULO);
|
2009-06-06 06:41:34 +02:00
|
|
|
|
|
|
|
cur = list;
|
|
|
|
previous = NULL;
|
|
|
|
|
|
|
|
for (i = 0; cur; cur = cur->next, i++) {
|
|
|
|
if (i == index) {
|
2015-11-10 03:22:28 +01:00
|
|
|
if (oidcmp(&cur->item->object.oid, current_bad_oid))
|
2009-06-06 06:41:34 +02:00
|
|
|
return cur;
|
|
|
|
if (previous)
|
|
|
|
return previous;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
previous = cur;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commit_list *managed_skipped(struct commit_list *list,
|
|
|
|
struct commit_list **tried)
|
|
|
|
{
|
|
|
|
int count, skipped_first;
|
|
|
|
|
|
|
|
*tried = NULL;
|
|
|
|
|
2011-05-19 23:34:33 +02:00
|
|
|
if (!skipped_revs.nr)
|
2009-06-06 06:41:34 +02:00
|
|
|
return list;
|
|
|
|
|
|
|
|
list = filter_skipped(list, tried, 0, &count, &skipped_first);
|
|
|
|
|
|
|
|
if (!skipped_first)
|
|
|
|
return list;
|
|
|
|
|
2009-06-13 07:21:06 +02:00
|
|
|
return skip_away(list, count);
|
2009-06-06 06:41:34 +02:00
|
|
|
}
|
|
|
|
|
2009-05-17 17:36:44 +02:00
|
|
|
static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
|
|
|
|
const char *bad_format, const char *good_format,
|
|
|
|
int read_paths)
|
2009-03-26 05:55:54 +01:00
|
|
|
{
|
2011-09-13 23:58:14 +02:00
|
|
|
struct argv_array rev_argv = ARGV_ARRAY_INIT;
|
2009-05-09 17:55:40 +02:00
|
|
|
int i;
|
|
|
|
|
2009-03-26 05:55:59 +01:00
|
|
|
init_revisions(revs, prefix);
|
|
|
|
revs->abbrev = 0;
|
|
|
|
revs->commit_format = CMIT_FMT_UNSPECIFIED;
|
2009-03-26 05:55:54 +01:00
|
|
|
|
2009-05-09 17:55:41 +02:00
|
|
|
/* rev_argv.argv[0] will be ignored by setup_revisions */
|
2011-09-13 23:58:14 +02:00
|
|
|
argv_array_push(&rev_argv, "bisect_rev_setup");
|
2015-03-14 00:39:29 +01:00
|
|
|
argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
|
2011-05-19 23:34:33 +02:00
|
|
|
for (i = 0; i < good_revs.nr; i++)
|
2011-09-13 23:58:14 +02:00
|
|
|
argv_array_pushf(&rev_argv, good_format,
|
2017-03-26 18:01:37 +02:00
|
|
|
oid_to_hex(good_revs.oid + i));
|
2011-09-13 23:58:14 +02:00
|
|
|
argv_array_push(&rev_argv, "--");
|
2009-05-17 17:36:44 +02:00
|
|
|
if (read_paths)
|
|
|
|
read_bisect_paths(&rev_argv);
|
2009-03-26 05:55:59 +01:00
|
|
|
|
2011-09-13 23:58:14 +02:00
|
|
|
setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL);
|
|
|
|
/* XXX leak rev_argv, as "revs" may still be pointing to it */
|
2009-03-26 05:55:59 +01:00
|
|
|
}
|
|
|
|
|
2009-05-17 17:36:44 +02:00
|
|
|
static void bisect_common(struct rev_info *revs)
|
2009-04-19 11:55:57 +02:00
|
|
|
{
|
|
|
|
if (prepare_revision_walk(revs))
|
|
|
|
die("revision walk setup failed");
|
|
|
|
if (revs->tree_objects)
|
2013-08-16 11:52:06 +02:00
|
|
|
mark_edges_uninteresting(revs, NULL);
|
2009-04-19 11:55:57 +02:00
|
|
|
}
|
|
|
|
|
2009-04-19 11:56:07 +02:00
|
|
|
static void exit_if_skipped_commits(struct commit_list *tried,
|
2015-03-14 00:39:29 +01:00
|
|
|
const struct object_id *bad)
|
2009-04-19 11:56:07 +02:00
|
|
|
{
|
|
|
|
if (!tried)
|
|
|
|
return;
|
|
|
|
|
|
|
|
printf("There are only 'skip'ped commits left to test.\n"
|
2015-06-29 17:40:29 +02:00
|
|
|
"The first %s commit could be any of:\n", term_bad);
|
2016-07-08 19:09:28 +02:00
|
|
|
|
|
|
|
for ( ; tried; tried = tried->next)
|
|
|
|
printf("%s\n", oid_to_hex(&tried->item->object.oid));
|
|
|
|
|
2009-04-19 11:56:07 +02:00
|
|
|
if (bad)
|
2015-03-14 00:39:29 +01:00
|
|
|
printf("%s\n", oid_to_hex(bad));
|
2016-06-17 22:21:12 +02:00
|
|
|
printf(_("We cannot bisect more!\n"));
|
2009-04-19 11:56:07 +02:00
|
|
|
exit(2);
|
|
|
|
}
|
|
|
|
|
2015-03-14 00:39:29 +01:00
|
|
|
static int is_expected_rev(const struct object_id *oid)
|
2009-05-09 17:55:45 +02:00
|
|
|
{
|
memoize common git-path "constant" files
One of the most common uses of git_path() is to pass a
constant, like git_path("MERGE_MSG"). This has two
drawbacks:
1. The return value is a static buffer, and the lifetime
is dependent on other calls to git_path, etc.
2. There's no compile-time checking of the pathname. This
is OK for a one-off (after all, we have to spell it
correctly at least once), but many of these constant
strings appear throughout the code.
This patch introduces a series of functions to "memoize"
these strings, which are essentially globals for the
lifetime of the program. We compute the value once, take
ownership of the buffer, and return the cached value for
subsequent calls. cache.h provides a helper macro for
defining these functions as one-liners, and defines a few
common ones for global use.
Using a macro is a little bit gross, but it does nicely
document the purpose of the functions. If we need to touch
them all later (e.g., because we learned how to change the
git_dir variable at runtime, and need to invalidate all of
the stored values), it will be much easier to have the
complete list.
Note that the shared-global functions have separate, manual
declarations. We could do something clever with the macros
(e.g., expand it to a declaration in some places, and a
declaration _and_ a definition in path.c). But there aren't
that many, and it's probably better to stay away from
too-magical macros.
Likewise, if we abandon the C preprocessor in favor of
generating these with a script, we could get much fancier.
E.g., normalizing "FOO/BAR-BAZ" into "git_path_foo_bar_baz".
But the small amount of saved typing is probably not worth
the resulting confusion to readers who want to grep for the
function's definition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-10 11:38:57 +02:00
|
|
|
const char *filename = git_path_bisect_expected_rev();
|
2009-05-09 17:55:45 +02:00
|
|
|
struct stat st;
|
|
|
|
struct strbuf str = STRBUF_INIT;
|
|
|
|
FILE *fp;
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
if (stat(filename, &st) || !S_ISREG(st.st_mode))
|
|
|
|
return 0;
|
|
|
|
|
2017-05-03 12:16:50 +02:00
|
|
|
fp = fopen_or_warn(filename, "r");
|
2009-05-09 17:55:45 +02:00
|
|
|
if (!fp)
|
|
|
|
return 0;
|
|
|
|
|
2016-01-14 00:31:17 +01:00
|
|
|
if (strbuf_getline_lf(&str, fp) != EOF)
|
2015-03-14 00:39:29 +01:00
|
|
|
res = !strcmp(str.buf, oid_to_hex(oid));
|
2009-05-09 17:55:45 +02:00
|
|
|
|
|
|
|
strbuf_release(&str);
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2017-07-14 01:49:24 +02:00
|
|
|
static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
|
2009-04-19 11:56:07 +02:00
|
|
|
{
|
2017-03-26 18:01:24 +02:00
|
|
|
char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
|
2009-04-19 11:56:07 +02:00
|
|
|
|
2017-07-14 01:49:24 +02:00
|
|
|
memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
|
2017-10-16 00:06:51 +02:00
|
|
|
update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
|
2009-04-19 11:56:07 +02:00
|
|
|
|
|
|
|
argv_checkout[2] = bisect_rev_hex;
|
2011-08-04 14:01:00 +02:00
|
|
|
if (no_checkout) {
|
2017-10-16 00:06:51 +02:00
|
|
|
update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
|
|
|
|
UPDATE_REFS_DIE_ON_ERR);
|
2011-08-04 14:01:00 +02:00
|
|
|
} else {
|
2014-01-29 14:25:00 +01:00
|
|
|
int res;
|
2011-08-04 14:01:00 +02:00
|
|
|
res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
|
|
|
|
if (res)
|
|
|
|
exit(res);
|
|
|
|
}
|
2009-04-19 11:56:07 +02:00
|
|
|
|
|
|
|
argv_show_branch[1] = bisect_rev_hex;
|
|
|
|
return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
|
|
|
|
}
|
|
|
|
|
2017-03-26 18:01:37 +02:00
|
|
|
static struct commit *get_commit_reference(const struct object_id *oid)
|
2009-05-09 17:55:45 +02:00
|
|
|
{
|
Convert lookup_commit* to struct object_id
Convert lookup_commit, lookup_commit_or_die,
lookup_commit_reference, and lookup_commit_reference_gently to take
struct object_id arguments.
Introduce a temporary in parse_object buffer in order to convert this
function. This is required since in order to convert parse_object and
parse_object_buffer, lookup_commit_reference_gently and
lookup_commit_or_die would need to be converted. Not introducing a
temporary would therefore require that lookup_commit_or_die take a
struct object_id *, but lookup_commit would take unsigned char *,
leaving a confusing and hard-to-use interface.
parse_object_buffer will lose this temporary in a later patch.
This commit was created with manual changes to commit.c, commit.h, and
object.c, plus the following semantic patch:
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1.hash, E2)
+ lookup_commit_reference_gently(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1->hash, E2)
+ lookup_commit_reference_gently(E1, E2)
@@
expression E1;
@@
- lookup_commit_reference(E1.hash)
+ lookup_commit_reference(&E1)
@@
expression E1;
@@
- lookup_commit_reference(E1->hash)
+ lookup_commit_reference(E1)
@@
expression E1;
@@
- lookup_commit(E1.hash)
+ lookup_commit(&E1)
@@
expression E1;
@@
- lookup_commit(E1->hash)
+ lookup_commit(E1)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1.hash, E2)
+ lookup_commit_or_die(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1->hash, E2)
+ lookup_commit_or_die(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 00:10:10 +02:00
|
|
|
struct commit *r = lookup_commit_reference(oid);
|
2009-05-09 17:55:45 +02:00
|
|
|
if (!r)
|
2017-03-26 18:01:37 +02:00
|
|
|
die(_("Not a valid commit name %s"), oid_to_hex(oid));
|
2009-05-09 17:55:45 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct commit **get_bad_and_good_commits(int *rev_nr)
|
|
|
|
{
|
2016-02-22 23:44:25 +01:00
|
|
|
struct commit **rev;
|
2009-05-09 17:55:45 +02:00
|
|
|
int i, n = 0;
|
|
|
|
|
2016-02-22 23:44:25 +01:00
|
|
|
ALLOC_ARRAY(rev, 1 + good_revs.nr);
|
2017-03-26 18:01:37 +02:00
|
|
|
rev[n++] = get_commit_reference(current_bad_oid);
|
2011-05-19 23:34:33 +02:00
|
|
|
for (i = 0; i < good_revs.nr; i++)
|
2017-03-26 18:01:37 +02:00
|
|
|
rev[n++] = get_commit_reference(good_revs.oid + i);
|
2009-05-09 17:55:45 +02:00
|
|
|
*rev_nr = n;
|
|
|
|
|
|
|
|
return rev;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_bad_merge_base(void)
|
|
|
|
{
|
2015-03-14 00:39:29 +01:00
|
|
|
if (is_expected_rev(current_bad_oid)) {
|
|
|
|
char *bad_hex = oid_to_hex(current_bad_oid);
|
2009-05-09 17:55:45 +02:00
|
|
|
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
|
2015-06-29 17:40:29 +02:00
|
|
|
if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
|
2016-06-17 22:21:12 +02:00
|
|
|
fprintf(stderr, _("The merge base %s is bad.\n"
|
2015-06-29 17:40:29 +02:00
|
|
|
"This means the bug has been fixed "
|
2016-06-17 22:21:12 +02:00
|
|
|
"between %s and [%s].\n"),
|
2015-06-29 17:40:29 +02:00
|
|
|
bad_hex, bad_hex, good_hex);
|
2015-06-29 17:40:33 +02:00
|
|
|
} else if (!strcmp(term_bad, "new") && !strcmp(term_good, "old")) {
|
2016-06-17 22:21:12 +02:00
|
|
|
fprintf(stderr, _("The merge base %s is new.\n"
|
2015-06-29 17:40:33 +02:00
|
|
|
"The property has changed "
|
2016-06-17 22:21:12 +02:00
|
|
|
"between %s and [%s].\n"),
|
2015-06-29 17:40:33 +02:00
|
|
|
bad_hex, bad_hex, good_hex);
|
2015-06-29 17:40:29 +02:00
|
|
|
} else {
|
2016-06-17 22:21:12 +02:00
|
|
|
fprintf(stderr, _("The merge base %s is %s.\n"
|
2015-06-29 17:40:29 +02:00
|
|
|
"This means the first '%s' commit is "
|
2016-06-17 22:21:12 +02:00
|
|
|
"between %s and [%s].\n"),
|
2015-06-29 17:40:29 +02:00
|
|
|
bad_hex, term_bad, term_good, bad_hex, good_hex);
|
|
|
|
}
|
2009-05-09 17:55:45 +02:00
|
|
|
exit(3);
|
|
|
|
}
|
|
|
|
|
2016-12-04 23:04:23 +01:00
|
|
|
fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
|
2009-05-09 17:55:45 +02:00
|
|
|
"git bisect cannot work properly in this case.\n"
|
2016-06-17 22:21:12 +02:00
|
|
|
"Maybe you mistook %s and %s revs?\n"),
|
2015-06-29 17:40:29 +02:00
|
|
|
term_good, term_bad, term_good, term_bad);
|
2009-05-09 17:55:45 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2017-03-31 03:39:57 +02:00
|
|
|
static void handle_skipped_merge_base(const struct object_id *mb)
|
2009-05-09 17:55:45 +02:00
|
|
|
{
|
2017-03-31 03:39:57 +02:00
|
|
|
char *mb_hex = oid_to_hex(mb);
|
2016-06-25 01:09:22 +02:00
|
|
|
char *bad_hex = oid_to_hex(current_bad_oid);
|
2009-05-09 17:55:45 +02:00
|
|
|
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
|
|
|
|
|
2016-06-17 22:21:12 +02:00
|
|
|
warning(_("the merge base between %s and [%s] "
|
2009-05-09 17:55:45 +02:00
|
|
|
"must be skipped.\n"
|
2015-06-29 17:40:29 +02:00
|
|
|
"So we cannot be sure the first %s commit is "
|
2009-05-09 17:55:45 +02:00
|
|
|
"between %s and %s.\n"
|
2016-06-17 22:21:12 +02:00
|
|
|
"We continue anyway."),
|
2015-06-29 17:40:29 +02:00
|
|
|
bad_hex, good_hex, term_bad, mb_hex, bad_hex);
|
2009-05-09 17:55:45 +02:00
|
|
|
free(good_hex);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2015-06-29 17:40:33 +02:00
|
|
|
* "check_merge_bases" checks that merge bases are not "bad" (or "new").
|
2009-05-09 17:55:45 +02:00
|
|
|
*
|
2015-06-29 17:40:33 +02:00
|
|
|
* - If one is "bad" (or "new"), it means the user assumed something wrong
|
2009-05-09 17:55:45 +02:00
|
|
|
* and we must exit with a non 0 error code.
|
2015-06-29 17:40:33 +02:00
|
|
|
* - If one is "good" (or "old"), that's good, we have nothing to do.
|
2009-05-09 17:55:45 +02:00
|
|
|
* - If one is "skipped", we can't know but we should warn.
|
|
|
|
* - If we don't know, we should check it out and ask the user to test.
|
|
|
|
*/
|
2017-12-25 18:45:36 +01:00
|
|
|
static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
|
2009-05-09 17:55:45 +02:00
|
|
|
{
|
|
|
|
struct commit_list *result;
|
|
|
|
|
2014-10-30 20:20:44 +01:00
|
|
|
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
|
2009-05-09 17:55:45 +02:00
|
|
|
|
|
|
|
for (; result; result = result->next) {
|
2017-03-31 03:39:57 +02:00
|
|
|
const struct object_id *mb = &result->item->object.oid;
|
|
|
|
if (!oidcmp(mb, current_bad_oid)) {
|
2009-05-09 17:55:45 +02:00
|
|
|
handle_bad_merge_base();
|
2017-03-31 03:40:00 +02:00
|
|
|
} else if (0 <= oid_array_lookup(&good_revs, mb)) {
|
2009-05-09 17:55:45 +02:00
|
|
|
continue;
|
2017-03-31 03:40:00 +02:00
|
|
|
} else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
|
2009-05-09 17:55:45 +02:00
|
|
|
handle_skipped_merge_base(mb);
|
|
|
|
} else {
|
2016-06-17 22:21:12 +02:00
|
|
|
printf(_("Bisecting: a merge base must be tested\n"));
|
2017-07-14 01:49:24 +02:00
|
|
|
exit(bisect_checkout(mb, no_checkout));
|
2009-05-09 17:55:45 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free_commit_list(result);
|
|
|
|
}
|
|
|
|
|
2017-12-25 18:45:36 +01:00
|
|
|
static int check_ancestors(int rev_nr, struct commit **rev, const char *prefix)
|
2009-05-09 17:55:46 +02:00
|
|
|
{
|
2009-05-17 17:36:46 +02:00
|
|
|
struct rev_info revs;
|
2011-10-01 18:16:08 +02:00
|
|
|
int res;
|
2009-05-09 17:55:46 +02:00
|
|
|
|
2009-05-17 17:36:46 +02:00
|
|
|
bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
|
2009-05-09 17:55:46 +02:00
|
|
|
|
2009-05-17 17:36:46 +02:00
|
|
|
bisect_common(&revs);
|
|
|
|
res = (revs.commits != NULL);
|
|
|
|
|
|
|
|
/* Clean up objects used, as they will be reused. */
|
2017-12-25 18:45:36 +01:00
|
|
|
clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
|
2009-05-09 17:55:46 +02:00
|
|
|
|
2009-05-17 17:36:46 +02:00
|
|
|
return res;
|
2009-05-09 17:55:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "check_good_are_ancestors_of_bad" checks that all "good" revs are
|
|
|
|
* ancestor of the "bad" rev.
|
|
|
|
*
|
|
|
|
* If that's not the case, we need to check the merge bases.
|
|
|
|
* If a merge base must be tested by the user, its source code will be
|
|
|
|
* checked out to be tested by the user and we will exit.
|
|
|
|
*/
|
2011-08-04 14:01:00 +02:00
|
|
|
static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
|
2009-05-09 17:55:46 +02:00
|
|
|
{
|
2012-09-04 19:30:21 +02:00
|
|
|
char *filename = git_pathdup("BISECT_ANCESTORS_OK");
|
2009-05-09 17:55:46 +02:00
|
|
|
struct stat st;
|
2017-12-25 18:45:36 +01:00
|
|
|
int fd, rev_nr;
|
|
|
|
struct commit **rev;
|
2009-05-09 17:55:46 +02:00
|
|
|
|
2015-03-14 00:39:29 +01:00
|
|
|
if (!current_bad_oid)
|
2016-06-17 22:21:12 +02:00
|
|
|
die(_("a %s revision is needed"), term_bad);
|
2009-05-09 17:55:46 +02:00
|
|
|
|
|
|
|
/* Check if file BISECT_ANCESTORS_OK exists. */
|
|
|
|
if (!stat(filename, &st) && S_ISREG(st.st_mode))
|
2012-04-27 00:26:59 +02:00
|
|
|
goto done;
|
2009-05-09 17:55:46 +02:00
|
|
|
|
|
|
|
/* Bisecting with no good rev is ok. */
|
2011-05-19 23:34:33 +02:00
|
|
|
if (good_revs.nr == 0)
|
2012-04-27 00:26:59 +02:00
|
|
|
goto done;
|
2009-05-09 17:55:46 +02:00
|
|
|
|
2009-05-17 17:36:46 +02:00
|
|
|
/* Check if all good revs are ancestor of the bad rev. */
|
2017-12-25 18:45:36 +01:00
|
|
|
rev = get_bad_and_good_commits(&rev_nr);
|
|
|
|
if (check_ancestors(rev_nr, rev, prefix))
|
|
|
|
check_merge_bases(rev_nr, rev, no_checkout);
|
|
|
|
free(rev);
|
2009-05-09 17:55:46 +02:00
|
|
|
|
|
|
|
/* Create file BISECT_ANCESTORS_OK. */
|
|
|
|
fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
|
|
|
if (fd < 0)
|
2016-06-17 22:21:12 +02:00
|
|
|
warning_errno(_("could not create file '%s'"),
|
2016-05-08 11:47:23 +02:00
|
|
|
filename);
|
2009-05-09 17:55:46 +02:00
|
|
|
else
|
|
|
|
close(fd);
|
2012-04-27 00:26:59 +02:00
|
|
|
done:
|
|
|
|
free(filename);
|
2009-05-09 17:55:46 +02:00
|
|
|
}
|
|
|
|
|
2009-05-28 23:21:16 +02:00
|
|
|
/*
|
|
|
|
* This does "git diff-tree --pretty COMMIT" without one fork+exec.
|
|
|
|
*/
|
|
|
|
static void show_diff_tree(const char *prefix, struct commit *commit)
|
|
|
|
{
|
|
|
|
struct rev_info opt;
|
|
|
|
|
|
|
|
/* diff-tree init */
|
|
|
|
init_revisions(&opt, prefix);
|
|
|
|
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
|
|
|
opt.abbrev = 0;
|
|
|
|
opt.diff = 1;
|
|
|
|
|
|
|
|
/* This is what "--pretty" does */
|
|
|
|
opt.verbose_header = 1;
|
|
|
|
opt.use_terminator = 0;
|
|
|
|
opt.commit_format = CMIT_FMT_DEFAULT;
|
|
|
|
|
|
|
|
/* diff-tree init */
|
|
|
|
if (!opt.diffopt.output_format)
|
|
|
|
opt.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
|
2016-06-17 01:37:20 +02:00
|
|
|
setup_revisions(0, NULL, &opt, NULL);
|
2009-05-28 23:21:16 +02:00
|
|
|
log_tree_commit(&opt, commit);
|
|
|
|
}
|
|
|
|
|
2015-06-29 17:40:30 +02:00
|
|
|
/*
|
|
|
|
* The terms used for this bisect session are stored in BISECT_TERMS.
|
|
|
|
* We read them and store them to adapt the messages accordingly.
|
|
|
|
* Default is bad/good.
|
|
|
|
*/
|
|
|
|
void read_bisect_terms(const char **read_bad, const char **read_good)
|
|
|
|
{
|
|
|
|
struct strbuf str = STRBUF_INIT;
|
2017-04-20 23:08:25 +02:00
|
|
|
const char *filename = git_path_bisect_terms();
|
2015-06-29 17:40:30 +02:00
|
|
|
FILE *fp = fopen(filename, "r");
|
|
|
|
|
|
|
|
if (!fp) {
|
|
|
|
if (errno == ENOENT) {
|
|
|
|
*read_bad = "bad";
|
|
|
|
*read_good = "good";
|
|
|
|
return;
|
|
|
|
} else {
|
2016-06-17 22:21:12 +02:00
|
|
|
die_errno(_("could not read file '%s'"), filename);
|
2015-06-29 17:40:30 +02:00
|
|
|
}
|
|
|
|
} else {
|
2016-01-14 00:31:17 +01:00
|
|
|
strbuf_getline_lf(&str, fp);
|
2015-06-29 17:40:30 +02:00
|
|
|
*read_bad = strbuf_detach(&str, NULL);
|
2016-01-14 00:31:17 +01:00
|
|
|
strbuf_getline_lf(&str, fp);
|
2015-06-29 17:40:30 +02:00
|
|
|
*read_good = strbuf_detach(&str, NULL);
|
|
|
|
}
|
|
|
|
strbuf_release(&str);
|
|
|
|
fclose(fp);
|
|
|
|
}
|
|
|
|
|
2009-04-19 11:56:07 +02:00
|
|
|
/*
|
|
|
|
* We use the convention that exiting with an exit code 10 means that
|
|
|
|
* the bisection process finished successfully.
|
|
|
|
* In this case the calling shell script should exit 0.
|
2011-08-04 14:01:00 +02:00
|
|
|
*
|
|
|
|
* If no_checkout is non-zero, the bisection process does not
|
|
|
|
* checkout the trial commit but instead simply updates BISECT_HEAD.
|
2009-04-19 11:56:07 +02:00
|
|
|
*/
|
2011-08-04 14:01:00 +02:00
|
|
|
int bisect_next_all(const char *prefix, int no_checkout)
|
2009-04-19 11:56:07 +02:00
|
|
|
{
|
|
|
|
struct rev_info revs;
|
|
|
|
struct commit_list *tried;
|
2010-01-19 16:13:33 +01:00
|
|
|
int reaches = 0, all = 0, nr, steps;
|
2017-07-14 01:49:24 +02:00
|
|
|
struct object_id *bisect_rev;
|
2017-02-16 18:07:12 +01:00
|
|
|
char *steps_msg;
|
2009-04-19 11:56:07 +02:00
|
|
|
|
2015-06-29 17:40:30 +02:00
|
|
|
read_bisect_terms(&term_bad, &term_good);
|
2009-05-09 17:55:42 +02:00
|
|
|
if (read_bisect_refs())
|
2016-06-17 22:21:12 +02:00
|
|
|
die(_("reading bisect refs failed"));
|
2009-05-09 17:55:42 +02:00
|
|
|
|
2011-08-04 14:01:00 +02:00
|
|
|
check_good_are_ancestors_of_bad(prefix, no_checkout);
|
2009-05-09 17:55:47 +02:00
|
|
|
|
2009-05-17 17:36:44 +02:00
|
|
|
bisect_rev_setup(&revs, prefix, "%s", "^%s", 1);
|
|
|
|
revs.limited = 1;
|
2009-05-09 17:55:42 +02:00
|
|
|
|
2009-05-17 17:36:44 +02:00
|
|
|
bisect_common(&revs);
|
2009-04-19 11:56:07 +02:00
|
|
|
|
2017-11-05 21:24:28 +01:00
|
|
|
find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr);
|
2009-06-06 06:41:34 +02:00
|
|
|
revs.commits = managed_skipped(revs.commits, &tried);
|
2009-04-19 11:56:07 +02:00
|
|
|
|
|
|
|
if (!revs.commits) {
|
|
|
|
/*
|
|
|
|
* We should exit here only if the "bad"
|
|
|
|
* commit is also a "skip" commit.
|
|
|
|
*/
|
|
|
|
exit_if_skipped_commits(tried, NULL);
|
|
|
|
|
2016-06-17 22:21:12 +02:00
|
|
|
printf(_("%s was both %s and %s\n"),
|
2015-06-29 17:40:29 +02:00
|
|
|
oid_to_hex(current_bad_oid),
|
|
|
|
term_good,
|
|
|
|
term_bad);
|
2009-04-19 11:56:07 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2010-02-28 23:19:09 +01:00
|
|
|
if (!all) {
|
2016-06-17 22:21:12 +02:00
|
|
|
fprintf(stderr, _("No testable commit found.\n"
|
|
|
|
"Maybe you started with bad path parameters?\n"));
|
2010-02-28 23:19:09 +01:00
|
|
|
exit(4);
|
|
|
|
}
|
|
|
|
|
2017-07-14 01:49:24 +02:00
|
|
|
bisect_rev = &revs.commits->item->object.oid;
|
2009-04-19 11:56:07 +02:00
|
|
|
|
2017-07-14 01:49:24 +02:00
|
|
|
if (!oidcmp(bisect_rev, current_bad_oid)) {
|
2015-03-14 00:39:29 +01:00
|
|
|
exit_if_skipped_commits(tried, current_bad_oid);
|
2017-07-14 01:49:24 +02:00
|
|
|
printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
|
2015-06-29 17:40:29 +02:00
|
|
|
term_bad);
|
2009-05-28 23:21:16 +02:00
|
|
|
show_diff_tree(prefix, revs.commits->item);
|
2009-04-19 11:56:07 +02:00
|
|
|
/* This means the bisection process succeeded. */
|
|
|
|
exit(10);
|
|
|
|
}
|
|
|
|
|
|
|
|
nr = all - reaches - 1;
|
2010-01-19 16:13:33 +01:00
|
|
|
steps = estimate_bisect_steps(all);
|
2017-02-16 18:07:12 +01:00
|
|
|
|
|
|
|
steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
|
|
|
|
steps), steps);
|
C style: use standard style for "TRANSLATORS" comments
Change all the "TRANSLATORS: [...]" comments in the C code to use the
regular Git coding style, and amend the style guide so that the
example there uses that style.
This custom style was necessary back in 2010 when the gettext support
was initially added, and was subsequently documented in commit
cbcfd4e3ea ("i18n: mention "TRANSLATORS:" marker in
Documentation/CodingGuidelines", 2014-04-18).
GNU xgettext hasn't had the parsing limitation that necessitated this
exception for almost 3 years. Since its 0.19 release on 2014-06-02
it's been able to recognize TRANSLATOR comments in the standard Git
comment syntax[1].
Usually we'd like to keep compatibility with software that's that
young, but in this case literally the only person who needs to be
using a gettext newer than 3 years old is Jiang Xin (the only person
who runs & commits "make pot" results), so I think in this case we can
make an exception.
This xgettext parsing feature was added after a thread on the Git
mailing list[2] which continued on the bug-gettext[3] list, but we
never subsequently changed our style & styleguide, do so.
There are already longstanding changes in git that use the standard
comment style & have their TRANSLATORS comments extracted properly
without getting the literal "*"'s mixed up in the text, as would
happen before xgettext 0.19.
Commit 7ff2683253 ("builtin-am: implement -i/--interactive",
2015-08-04) added one such comment, which in commit df0617bfa7 ("l10n:
git.pot: v2.6.0 round 1 (123 new, 41 removed)", 2015-09-05) got picked
up in the po/git.pot file with the right format, showing that Jiang
already runs a modern xgettext.
The xgettext parser does not handle the sort of non-standard comment
style that I'm amending here in sequencer.c, but that isn't standard
Git comment syntax anyway. With this change to sequencer.c & "make
pot" the comment in the pot file is now correct:
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
1. http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=10af7fe6bd
2. <2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com>
(https://public-inbox.org/git/2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com/)
3. https://lists.gnu.org/archive/html/bug-gettext/2014-04/msg00016.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-11 23:20:12 +02:00
|
|
|
/*
|
|
|
|
* TRANSLATORS: the last %s will be replaced with "(roughly %d
|
|
|
|
* steps)" translation.
|
|
|
|
*/
|
2016-06-17 22:21:12 +02:00
|
|
|
printf(Q_("Bisecting: %d revision left to test after this %s\n",
|
|
|
|
"Bisecting: %d revisions left to test after this %s\n",
|
|
|
|
nr), nr, steps_msg);
|
2017-02-16 18:07:12 +01:00
|
|
|
free(steps_msg);
|
2009-04-19 11:56:07 +02:00
|
|
|
|
2015-07-31 08:06:20 +02:00
|
|
|
return bisect_checkout(bisect_rev, no_checkout);
|
2009-04-19 11:56:07 +02:00
|
|
|
}
|
|
|
|
|
2012-10-26 17:53:50 +02:00
|
|
|
static inline int log2i(int n)
|
|
|
|
{
|
|
|
|
int log2 = 0;
|
|
|
|
|
|
|
|
for (; n > 1; n >>= 1)
|
|
|
|
log2++;
|
|
|
|
|
|
|
|
return log2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int exp2i(int n)
|
|
|
|
{
|
|
|
|
return 1 << n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Estimate the number of bisect steps left (after the current step)
|
|
|
|
*
|
|
|
|
* For any x between 0 included and 2^n excluded, the probability for
|
|
|
|
* n - 1 steps left looks like:
|
|
|
|
*
|
|
|
|
* P(2^n + x) == (2^n - x) / (2^n + x)
|
|
|
|
*
|
|
|
|
* and P(2^n + x) < 0.5 means 2^n < 3x
|
|
|
|
*/
|
|
|
|
int estimate_bisect_steps(int all)
|
|
|
|
{
|
|
|
|
int n, x, e;
|
|
|
|
|
|
|
|
if (all < 3)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
n = log2i(all);
|
|
|
|
e = exp2i(n);
|
|
|
|
x = all - e;
|
|
|
|
|
|
|
|
return (e < 3 * x) ? n : n - 1;
|
|
|
|
}
|
2017-09-29 08:49:39 +02:00
|
|
|
|
|
|
|
static int mark_for_removal(const char *refname, const struct object_id *oid,
|
|
|
|
int flag, void *cb_data)
|
|
|
|
{
|
|
|
|
struct string_list *refs = cb_data;
|
|
|
|
char *ref = xstrfmt("refs/bisect%s", refname);
|
|
|
|
string_list_append(refs, ref);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int bisect_clean_state(void)
|
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
|
|
|
|
/* There may be some refs packed during bisection */
|
|
|
|
struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
|
|
|
|
for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
|
|
|
|
string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
|
2017-11-15 04:14:29 +01:00
|
|
|
result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
|
2017-09-29 08:49:39 +02:00
|
|
|
refs_for_removal.strdup_strings = 1;
|
|
|
|
string_list_clear(&refs_for_removal, 0);
|
|
|
|
unlink_or_warn(git_path_bisect_expected_rev());
|
|
|
|
unlink_or_warn(git_path_bisect_ancestors_ok());
|
|
|
|
unlink_or_warn(git_path_bisect_log());
|
|
|
|
unlink_or_warn(git_path_bisect_names());
|
|
|
|
unlink_or_warn(git_path_bisect_run());
|
|
|
|
unlink_or_warn(git_path_bisect_terms());
|
|
|
|
/* Cleanup head-name if it got left by an old version of git-bisect */
|
|
|
|
unlink_or_warn(git_path_head_name());
|
|
|
|
/*
|
|
|
|
* Cleanup BISECT_START last to support the --no-checkout option
|
|
|
|
* introduced in the commit 4796e823a.
|
|
|
|
*/
|
|
|
|
unlink_or_warn(git_path_bisect_start());
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|