Skip to content

Commit 7383b25

Browse files
peffgitster
authored andcommitted
bisect: stop referring to sha1_array
Our join_sha1_array_hex() function long ago switched to using an oid_array; let's change the name to match. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ed4b804 commit 7383b25

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bisect.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ static void read_bisect_paths(struct argv_array *array)
473473
fclose(fp);
474474
}
475475

476-
static char *join_sha1_array_hex(struct oid_array *array, char delim)
476+
static char *join_oid_array_hex(struct oid_array *array, char delim)
477477
{
478478
struct strbuf joined_hexs = STRBUF_INIT;
479479
int i;
@@ -765,7 +765,7 @@ static enum bisect_error handle_bad_merge_base(void)
765765
{
766766
if (is_expected_rev(current_bad_oid)) {
767767
char *bad_hex = oid_to_hex(current_bad_oid);
768-
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
768+
char *good_hex = join_oid_array_hex(&good_revs, ' ');
769769
if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
770770
fprintf(stderr, _("The merge base %s is bad.\n"
771771
"This means the bug has been fixed "
@@ -796,7 +796,7 @@ static void handle_skipped_merge_base(const struct object_id *mb)
796796
{
797797
char *mb_hex = oid_to_hex(mb);
798798
char *bad_hex = oid_to_hex(current_bad_oid);
799-
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
799+
char *good_hex = join_oid_array_hex(&good_revs, ' ');
800800

801801
warning(_("the merge base between %s and [%s] "
802802
"must be skipped.\n"

0 commit comments

Comments
 (0)