summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-03-30 14:04:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-30 17:59:08 (GMT)
commit7383b25d76e5d6465e001b02530464117fb55579 (patch)
treec8d78d28aab6d2091f32a2561884ade8a2d0ccf3 /bisect.c
parented4b804e46b177203b4035cf5a1271f50724ba1c (diff)
downloadgit-7383b25d76e5d6465e001b02530464117fb55579.zip
git-7383b25d76e5d6465e001b02530464117fb55579.tar.gz
git-7383b25d76e5d6465e001b02530464117fb55579.tar.bz2
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>
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index 64b579b..d5e8304 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"