builtin/merge: switch to use the_hash_algo
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>
brian m. carlson committed
Jul 16, 2018 at 01:28 UTC
ab47df2d9a1d07380a02c9be2c57bca1cfbb054e
1 file changed
+6
-5
builtin/merge.c
+6
-5
@@ -1034,6 +1034,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
1034
const char *filename;
1035
int fd, pos, npos;
1036
struct strbuf fetch_head_file = STRBUF_INIT;
1037
+ const unsigned hexsz = the_hash_algo->hexsz;
1038
1039
if (!merge_names)
1040
merge_names = &fetch_head_file;
@@ -1059,16 +1060,16 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
1060
else
1061
npos = merge_names->len;
1062
1062
- if (npos - pos < GIT_SHA1_HEXSZ + 2 ||
1063
+ if (npos - pos < hexsz + 2 ||
1064
get_oid_hex(merge_names->buf + pos, &oid))
1065
commit = NULL; /* bad */
1065
- else if (memcmp(merge_names->buf + pos + GIT_SHA1_HEXSZ, "\t\t", 2))
1066
+ else if (memcmp(merge_names->buf + pos + hexsz, "\t\t", 2))
1067
continue; /* not-for-merge */
1068
else {
1068
- char saved = merge_names->buf[pos + GIT_SHA1_HEXSZ];
1069
- merge_names->buf[pos + GIT_SHA1_HEXSZ] = '\0';
1069
+ char saved = merge_names->buf[pos + hexsz];
1070
+ merge_names->buf[pos + hexsz] = '\0';
1071
commit = get_merge_parent(merge_names->buf + pos);
1071
- merge_names->buf[pos + GIT_SHA1_HEXSZ] = saved;
1072
+ merge_names->buf[pos + hexsz] = saved;
1073
}
1074
if (!commit) {
1075
if (ptr)