[PATCH 5/7] bisect: stop referring to sha1_array
- From
Jeff King <peff@peff.net>
- Date
- Mar 30, 2020, 14:04 UTC
- Message-ID
- <20200330140406.GE2456038@coredump.intra.peff.net>
- In-Reply-To
- <20200330140247.GA476088@coredump.intra.peff.net>
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> --- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bisect.c b/bisect.c index 64b579b6ea..d5e830410f 100644 --- a/bisect.c +++ b/bisect.c @@ -473,7 +473,7 @@ static void read_bisect_paths(struct argv_array *array) fclose(fp); } -static char *join_sha1_array_hex(struct oid_array *array, char delim) +static char *join_oid_array_hex(struct oid_array *array, char delim) { struct strbuf joined_hexs = STRBUF_INIT; int i; @@ -765,7 +765,7 @@ static enum bisect_error handle_bad_merge_base(void) { if (is_expected_rev(current_bad_oid)) { char *bad_hex = oid_to_hex(current_bad_oid); - char *good_hex = join_sha1_array_hex(&good_revs, ' '); + char *good_hex = join_oid_array_hex(&good_revs, ' '); if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) { fprintf(stderr, _("The merge base %s is bad.\n" "This means the bug has been fixed " @@ -796,7 +796,7 @@ static void handle_skipped_merge_base(const struct object_id *mb) { char *mb_hex = oid_to_hex(mb); char *bad_hex = oid_to_hex(current_bad_oid); - char *good_hex = join_sha1_array_hex(&good_revs, ' '); + char *good_hex = join_oid_array_hex(&good_revs, ' '); warning(_("the merge base between %s and [%s] " "must be skipped.\n"
-- 2.26.0.597.g7e08ed78ff