diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:49 -0700 |
| commit | a768f866e9233b758cb21e25c7b8c985b0009c1f (patch) | |
| tree | 1b411eb4c59a9e648a50c1dfe829d89418d0b30b /bisect.c | |
| parent | 7a8bb6db7cc04add05484c4fc907e34f76b12fb9 (diff) | |
| parent | 0740d0a5d3046e28b8d49baafafe521c5fc81711 (diff) | |
| download | git-a768f866e9233b758cb21e25c7b8c985b0009c1f.tar.gz | |
Merge branch 'jk/oid-array-cleanups'
Code cleanup.
* jk/oid-array-cleanups:
oidset: stop referring to sha1-array
ref-filter: stop referring to "sha1 array"
bisect: stop referring to sha1_array
test-tool: rename sha1-array to oid-array
oid_array: rename source file from sha1-array
oid_array: use size_t for iteration
oid_array: use size_t for count and allocation
Diffstat (limited to 'bisect.c')
| -rw-r--r-- | bisect.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -10,7 +10,7 @@ #include "run-command.h" #include "log-tree.h" #include "bisect.h" -#include "sha1-array.h" +#include "oid-array.h" #include "argv-array.h" #include "commit-slab.h" #include "commit-reach.h" @@ -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" |