[PATCH v2 1/3] sha1_name: convert struct min_abbrev_data to object_id
- From
Derrick Stolee <dstolee@microsoft.com>
- Date
- Mar 22, 2018, 17:40 UTC
- Message-ID
- <20180322174010.120117-2-dstolee@microsoft.com>
- In-Reply-To
- <20180322174010.120117-1-dstolee@microsoft.com>
From: "brian m. carlson" <sandals@crustytoothpaste.net>
This structure is only written to in one place, where we already have a struct object_id. Convert the struct to use a struct object_id instead.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- sha1_name.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c index 39e911c8ba..16e0003396 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -480,7 +480,7 @@ struct min_abbrev_data { unsigned int init_len; unsigned int cur_len; char *hex; - const unsigned char *hash; + const struct object_id *oid; }; static inline char get_hex_char_from_oid(const struct object_id *oid, @@ -526,7 +526,7 @@ static void find_abbrev_len_for_pack(struct packed_git *p, int cmp; current = nth_packed_object_sha1(p, mid); - cmp = hashcmp(mad->hash, current); + cmp = hashcmp(mad->oid->hash, current); if (!cmp) { match = 1; first = mid; @@ -603,7 +603,7 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len) mad.init_len = len; mad.cur_len = len; mad.hex = hex; - mad.hash = oid->hash; + mad.oid = oid; find_abbrev_len_packed(&mad); base-commit: 1a750441a7360b29fff7a414649ece1d35acaca6
-- 2.17.0.rc0