mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect.c: convert leaf functions to use struct object_id

Browse Source 
Convert some constants to GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2015-03-13 23:39:29 +00:00
committed by Junio C Hamano
parent aa1c6fdf47
commit 3c5ff9956c
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
bisect.c
View File

@ -15,7 +15,7 @@
static struct sha1_array good_revs; static struct sha1_array good_revs;
static struct sha1_array skipped_revs; static struct sha1_array skipped_revs;
static unsigned char *current_bad_sha1; static struct object_id *current_bad_oid;
static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
static const char *argv_show_branch[] = {"show-branch", NULL, NULL}; static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
@ -404,8 +404,8 @@ static int register_ref(const char *refname, const unsigned char *sha1,
int flags, void *cb_data) int flags, void *cb_data)
{ {
if (!strcmp(refname, "bad")) { if (!strcmp(refname, "bad")) {
current_bad_sha1 = xmalloc(20); current_bad_oid = xmalloc(sizeof(*current_bad_oid));
hashcpy(current_bad_sha1, sha1); hashcpy(current_bad_oid->hash, sha1);
} else if (starts_with(refname, "good-")) { } else if (starts_with(refname, "good-")) {
sha1_array_append(&good_revs, sha1); sha1_array_append(&good_revs, sha1);
} else if (starts_with(refname, "skip-")) { } else if (starts_with(refname, "skip-")) {
@ -564,7 +564,7 @@ static struct commit_list *skip_away(struct commit_list *list, int count)
for (i = 0; cur; cur = cur->next, i++) { for (i = 0; cur; cur = cur->next, i++) {
if (i == index) { if (i == index) {
if (hashcmp(cur->item->object.sha1, current_bad_sha1)) if (hashcmp(cur->item->object.sha1, current_bad_oid->hash))
return cur; return cur;
if (previous) if (previous)
return previous; return previous;
@ -607,7 +607,7 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
/* rev_argv.argv[0] will be ignored by setup_revisions */ /* rev_argv.argv[0] will be ignored by setup_revisions */
argv_array_push(&rev_argv, "bisect_rev_setup"); argv_array_push(&rev_argv, "bisect_rev_setup");
argv_array_pushf(&rev_argv, bad_format, sha1_to_hex(current_bad_sha1)); argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
for (i = 0; i < good_revs.nr; i++) for (i = 0; i < good_revs.nr; i++)
argv_array_pushf(&rev_argv, good_format, argv_array_pushf(&rev_argv, good_format,
sha1_to_hex(good_revs.sha1[i])); sha1_to_hex(good_revs.sha1[i]));
@ -628,7 +628,7 @@ static void bisect_common(struct rev_info *revs)
} }
static void exit_if_skipped_commits(struct commit_list *tried, static void exit_if_skipped_commits(struct commit_list *tried,
const unsigned char *bad) const struct object_id *bad)
{ {
if (!tried) if (!tried)
return; return;
@ -637,12 +637,12 @@ static void exit_if_skipped_commits(struct commit_list *tried,
"The first bad commit could be any of:\n"); "The first bad commit could be any of:\n");
print_commit_list(tried, "%s\n", "%s\n"); print_commit_list(tried, "%s\n", "%s\n");
if (bad) if (bad)
printf("%s\n", sha1_to_hex(bad)); printf("%s\n", oid_to_hex(bad));
printf("We cannot bisect more!\n"); printf("We cannot bisect more!\n");
exit(2); exit(2);
} }
static int is_expected_rev(const unsigned char *sha1) static int is_expected_rev(const struct object_id *oid)
{ {
const char *filename = git_path("BISECT_EXPECTED_REV"); const char *filename = git_path("BISECT_EXPECTED_REV");
struct stat st; struct stat st;
@ -658,7 +658,7 @@ static int is_expected_rev(const unsigned char *sha1)
return 0; return 0;
if (strbuf_getline(&str, fp, '\n') != EOF) if (strbuf_getline(&str, fp, '\n') != EOF)
res = !strcmp(str.buf, sha1_to_hex(sha1)); res = !strcmp(str.buf, oid_to_hex(oid));
strbuf_release(&str); strbuf_release(&str);
fclose(fp); fclose(fp);
@ -719,7 +719,7 @@ static struct commit **get_bad_and_good_commits(int *rev_nr)
struct commit **rev = xmalloc(len * sizeof(*rev)); struct commit **rev = xmalloc(len * sizeof(*rev));
int i, n = 0; int i, n = 0;
rev[n++] = get_commit_reference(current_bad_sha1); rev[n++] = get_commit_reference(current_bad_oid->hash);
for (i = 0; i < good_revs.nr; i++) for (i = 0; i < good_revs.nr; i++)
rev[n++] = get_commit_reference(good_revs.sha1[i]); rev[n++] = get_commit_reference(good_revs.sha1[i]);
*rev_nr = n; *rev_nr = n;
@ -729,8 +729,8 @@ static struct commit **get_bad_and_good_commits(int *rev_nr)
static void handle_bad_merge_base(void) static void handle_bad_merge_base(void)
{ {
if (is_expected_rev(current_bad_sha1)) { if (is_expected_rev(current_bad_oid)) {
char *bad_hex = sha1_to_hex(current_bad_sha1); char *bad_hex = oid_to_hex(current_bad_oid);
char *good_hex = join_sha1_array_hex(&good_revs, ' '); char *good_hex = join_sha1_array_hex(&good_revs, ' ');
fprintf(stderr, "The merge base %s is bad.\n" fprintf(stderr, "The merge base %s is bad.\n"
@ -750,7 +750,7 @@ static void handle_bad_merge_base(void)
static void handle_skipped_merge_base(const unsigned char *mb) static void handle_skipped_merge_base(const unsigned char *mb)
{ {
char *mb_hex = sha1_to_hex(mb); char *mb_hex = sha1_to_hex(mb);
char *bad_hex = sha1_to_hex(current_bad_sha1); char *bad_hex = sha1_to_hex(current_bad_oid->hash);
char *good_hex = join_sha1_array_hex(&good_revs, ' '); char *good_hex = join_sha1_array_hex(&good_revs, ' ');
warning("the merge base between %s and [%s] " warning("the merge base between %s and [%s] "
@ -781,7 +781,7 @@ static void check_merge_bases(int no_checkout)
for (; result; result = result->next) { for (; result; result = result->next) {
const unsigned char *mb = result->item->object.sha1; const unsigned char *mb = result->item->object.sha1;
if (!hashcmp(mb, current_bad_sha1)) { if (!hashcmp(mb, current_bad_oid->hash)) {
handle_bad_merge_base(); handle_bad_merge_base();
} else if (0 <= sha1_array_lookup(&good_revs, mb)) { } else if (0 <= sha1_array_lookup(&good_revs, mb)) {
continue; continue;
@ -838,7 +838,7 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
struct stat st; struct stat st;
int fd; int fd;
if (!current_bad_sha1) if (!current_bad_oid)
die("a bad revision is needed"); die("a bad revision is needed");
/* Check if file BISECT_ANCESTORS_OK exists. */ /* Check if file BISECT_ANCESTORS_OK exists. */
@ -903,7 +903,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
struct commit_list *tried; struct commit_list *tried;
int reaches = 0, all = 0, nr, steps; int reaches = 0, all = 0, nr, steps;
const unsigned char *bisect_rev; const unsigned char *bisect_rev;
char bisect_rev_hex[41]; char bisect_rev_hex[GIT_SHA1_HEXSZ + 1];
if (read_bisect_refs()) if (read_bisect_refs())
die("reading bisect refs failed"); die("reading bisect refs failed");
@ -927,7 +927,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
exit_if_skipped_commits(tried, NULL); exit_if_skipped_commits(tried, NULL);
printf("%s was both good and bad\n", printf("%s was both good and bad\n",
sha1_to_hex(current_bad_sha1)); oid_to_hex(current_bad_oid));
exit(1); exit(1);
} }
@ -938,10 +938,10 @@ int bisect_next_all(const char *prefix, int no_checkout)
} }
bisect_rev = revs.commits->item->object.sha1; bisect_rev = revs.commits->item->object.sha1;
memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41); memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
if (!hashcmp(bisect_rev, current_bad_sha1)) { if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
exit_if_skipped_commits(tried, current_bad_sha1); exit_if_skipped_commits(tried, current_bad_oid);
printf("%s is the first bad commit\n", bisect_rev_hex); printf("%s is the first bad commit\n", bisect_rev_hex);
show_diff_tree(prefix, revs.commits->item); show_diff_tree(prefix, revs.commits->item);
/* This means the bisection process succeeded. */ /* This means the bisection process succeeded. */