From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH 06/17] sha1-name: use the_hash_algo when parsing object names
Date: Sun, 8 Jul 2018 23:36:27 +0000 [thread overview]
Message-ID: <20180708233638.520172-7-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180708233638.520172-1-sandals@crustytoothpaste.net>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
sha1-name.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sha1-name.c b/sha1-name.c
index 60d9ef3c7e..ba6a5a689f 100644
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -310,7 +310,7 @@ static int init_object_disambiguation(const char *name, int len,
{
int i;
- if (len < MINIMUM_ABBREV || len > GIT_SHA1_HEXSZ)
+ if (len < MINIMUM_ABBREV || len > the_hash_algo->hexsz)
return -1;
memset(ds, 0, sizeof(*ds));
@@ -576,6 +576,8 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
struct disambiguate_state ds;
struct min_abbrev_data mad;
struct object_id oid_ret;
+ const unsigned hexsz = the_hash_algo->hexsz;
+
if (len < 0) {
unsigned long count = approximate_object_count();
/*
@@ -599,8 +601,8 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
}
oid_to_hex_r(hex, oid);
- if (len == GIT_SHA1_HEXSZ || !len)
- return GIT_SHA1_HEXSZ;
+ if (len == hexsz || !len)
+ return hexsz;
mad.init_len = len;
mad.cur_len = len;
@@ -706,7 +708,7 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
int refs_found = 0;
int at, reflog_len, nth_prior = 0;
- if (len == GIT_SHA1_HEXSZ && !get_oid_hex(str, oid)) {
+ if (len == the_hash_algo->hexsz && !get_oid_hex(str, oid)) {
if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
refs_found = dwim_ref(str, len, &tmp_oid, &real_ref);
if (refs_found > 0) {
@@ -750,7 +752,7 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
int detached;
if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
- detached = (buf.len == GIT_SHA1_HEXSZ && !get_oid_hex(buf.buf, oid));
+ detached = (buf.len == the_hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
strbuf_release(&buf);
if (detached)
return 0;
next prev parent reply other threads:[~2018-07-08 23:37 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-08 23:36 [PATCH 00/17] object_id part 14 brian m. carlson
2018-07-08 23:36 ` [PATCH 01/17] cache: update object ID functions for the_hash_algo brian m. carlson
2018-07-09 2:38 ` Jacob Keller
2018-07-09 4:05 ` Eric Sunshine
2018-07-09 4:31 ` Jacob Keller
2018-07-09 23:26 ` brian m. carlson
2018-07-08 23:36 ` [PATCH 02/17] tree-walk: replace hard-coded constants with the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 03/17] hex: switch to using the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 04/17] commit: express tree entry constants in terms of the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 05/17] strbuf: allocate space with GIT_MAX_HEXSZ brian m. carlson
2018-07-08 23:36 ` brian m. carlson [this message]
2018-07-08 23:36 ` [PATCH 07/17] commit: increase commit message buffer size brian m. carlson
2018-07-09 13:09 ` Derrick Stolee
2018-07-09 17:24 ` Stefan Beller
2018-07-09 17:27 ` Brandon Williams
2018-07-09 17:34 ` Junio C Hamano
2018-07-09 17:36 ` Brandon Williams
2018-07-09 17:45 ` Junio C Hamano
2018-07-09 23:39 ` brian m. carlson
2018-07-10 16:35 ` Junio C Hamano
2018-07-10 18:08 ` Ben Peart
2018-07-11 1:43 ` brian m. carlson
2018-07-11 15:36 ` Junio C Hamano
2018-07-08 23:36 ` [PATCH 08/17] refs/files-backend: use the_hash_algo for writing refs brian m. carlson
2018-07-08 23:36 ` [PATCH 09/17] builtin/update-index: convert to using the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 10/17] builtin/update-index: simplify parsing of cacheinfo brian m. carlson
2018-07-08 23:36 ` [PATCH 11/17] builtin/fmt-merge-msg: make hash independent brian m. carlson
2018-07-08 23:36 ` [PATCH 12/17] builtin/merge: switch to use the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 13/17] builtin/merge-recursive: make hash independent brian m. carlson
2018-07-08 23:36 ` [PATCH 14/17] diff: switch GIT_SHA1_HEXSZ to use the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 15/17] log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz brian m. carlson
2018-07-08 23:36 ` [PATCH 16/17] sha1-file: convert constants to uses of the_hash_algo brian m. carlson
2018-07-08 23:36 ` [PATCH 17/17] pretty: switch hard-coded constants to the_hash_algo brian m. carlson
2018-07-09 3:12 ` [PATCH 00/17] object_id part 14 Jacob Keller
2018-07-09 13:12 ` Derrick Stolee
2018-07-14 23:38 ` Michael Haggerty
2018-07-16 21:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180708233638.520172-7-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).