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

builtin/merge: switch to use the_hash_algo

Browse Source 
Switch uses of GIT_SHA1_HEXSZ to use the_hash_algo 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-07-16 01:28:03 +00:00 committed by Junio C Hamano
parent 5188eb5d8e
commit ab47df2d9a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/merge.c
View File

@ -1034,6 +1034,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
const char *filename; const char *filename;
int fd, pos, npos; int fd, pos, npos;
struct strbuf fetch_head_file = STRBUF_INIT; struct strbuf fetch_head_file = STRBUF_INIT;
const unsigned hexsz = the_hash_algo->hexsz;
if (!merge_names) if (!merge_names)
merge_names = &fetch_head_file; merge_names = &fetch_head_file;
@ -1059,16 +1060,16 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
else else
npos = merge_names->len; npos = merge_names->len;
if (npos - pos < GIT_SHA1_HEXSZ + 2 || if (npos - pos < hexsz + 2 ||
get_oid_hex(merge_names->buf + pos, &oid)) get_oid_hex(merge_names->buf + pos, &oid))
commit = NULL; /* bad */ commit = NULL; /* bad */
else if (memcmp(merge_names->buf + pos + GIT_SHA1_HEXSZ, "\t\t", 2)) else if (memcmp(merge_names->buf + pos + hexsz, "\t\t", 2))
continue; /* not-for-merge */ continue; /* not-for-merge */
else { else {
char saved = merge_names->buf[pos + GIT_SHA1_HEXSZ]; char saved = merge_names->buf[pos + hexsz];
merge_names->buf[pos + GIT_SHA1_HEXSZ] = '\0'; merge_names->buf[pos + hexsz] = '\0';
commit = get_merge_parent(merge_names->buf + pos); commit = get_merge_parent(merge_names->buf + pos);
merge_names->buf[pos + GIT_SHA1_HEXSZ] = saved; merge_names->buf[pos + hexsz] = saved;
} }
if (!commit) { if (!commit) {
if (ptr) if (ptr)