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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 30, 2020 at 10:04 UTC
7383b25d76e5d6465e001b02530464117fb55579
1 file changed
+3
-3
bisect.c
+3
-3
@@ -473,7 +473,7 @@ static void read_bisect_paths(struct argv_array *array)
473
fclose(fp);
474
}
475
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)
477
{
478
struct strbuf joined_hexs = STRBUF_INIT;
479
int i;
@@ -765,7 +765,7 @@ static enum bisect_error handle_bad_merge_base(void)
765
{
766
if (is_expected_rev(current_bad_oid)) {
767
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, ' ');
769
if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
770
fprintf(stderr, _("The merge base %s is bad.\n"
771
"This means the bug has been fixed "
@@ -796,7 +796,7 @@ static void handle_skipped_merge_base(const struct object_id *mb)
796
{
797
char *mb_hex = oid_to_hex(mb);
798
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, ' ');
800
801
warning(_("the merge base between %s and [%s] "
802
"must be skipped.\n"