undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1_name: convert struct min_abbrev_data to object_id

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2018-03-22 13:40:08 -04:00 committed by Junio C Hamano
parent 1a750441a7
commit 626fd982a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1_name.c
View File

@ -480,7 +480,7 @@ struct min_abbrev_data {
unsigned int init_len; unsigned int init_len;
unsigned int cur_len; unsigned int cur_len;
char *hex; char *hex;
const unsigned char *hash; const struct object_id *oid;
}; };
static inline char get_hex_char_from_oid(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; int cmp;
current = nth_packed_object_sha1(p, mid); current = nth_packed_object_sha1(p, mid);
cmp = hashcmp(mad->hash, current); cmp = hashcmp(mad->oid->hash, current);
if (!cmp) { if (!cmp) {
match = 1; match = 1;
first = mid; 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.init_len = len;
mad.cur_len = len; mad.cur_len = len;
mad.hex = hex; mad.hex = hex;
mad.hash = oid->hash; mad.oid = oid;
find_abbrev_len_packed(&mad); find_abbrev_len_packed(&mad);