diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2019-02-19 00:05:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-01 02:57:38 (GMT) |
| commit | 1c4675dc57b96f108adcfebb1fcfd67128ae856e (patch) | |
| tree | 1e9a8b934b5f71cc44f84da2e2f17da602e3a260 /builtin/name-rev.c | |
| parent | 538b1523246ba0845564a6b703c6e4ff1921c16a (diff) | |
| download | git-1c4675dc57b96f108adcfebb1fcfd67128ae856e.zip git-1c4675dc57b96f108adcfebb1fcfd67128ae856e.tar.gz git-1c4675dc57b96f108adcfebb1fcfd67128ae856e.tar.bz2 | |
builtin/name-rev: make hash-size independent
Use the_hash_algo when parsing instead of GIT_SHA1_HEXSZ so that this
function works with any size hash. Rename the variable forty to
counter, as this is a better name and is independent of the hash size.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/name-rev.c')
| -rw-r--r-- | builtin/name-rev.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index f1cb45c..05ccf53 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -361,23 +361,25 @@ static char const * const name_rev_usage[] = { static void name_rev_line(char *p, struct name_ref_data *data) { struct strbuf buf = STRBUF_INIT; - int forty = 0; + int counter = 0; char *p_start; + const unsigned hexsz = the_hash_algo->hexsz; + for (p_start = p; *p; p++) { #define ishex(x) (isdigit((x)) || ((x) >= 'a' && (x) <= 'f')) if (!ishex(*p)) - forty = 0; - else if (++forty == GIT_SHA1_HEXSZ && + counter = 0; + else if (++counter == hexsz && !ishex(*(p+1))) { struct object_id oid; const char *name = NULL; char c = *(p+1); int p_len = p - p_start + 1; - forty = 0; + counter = 0; *(p+1) = 0; - if (!get_oid(p - (GIT_SHA1_HEXSZ - 1), &oid)) { + if (!get_oid(p - (hexsz - 1), &oid)) { struct object *o = lookup_object(the_repository, oid.hash); @@ -390,7 +392,7 @@ static void name_rev_line(char *p, struct name_ref_data *data) continue; if (data->name_only) - printf("%.*s%s", p_len - GIT_SHA1_HEXSZ, p_start, name); + printf("%.*s%s", p_len - hexsz, p_start, name); else printf("%.*s (%s)", p_len, p_start, name); p_start = p + 1; |