diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-07-16 01:28:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 21:27:39 (GMT) |
| commit | ab47df2d9a1d07380a02c9be2c57bca1cfbb054e (patch) | |
| tree | 2015442f435be939608d99ac36da7efd75d1cf36 /builtin | |
| parent | 5188eb5d8e80c2f330fbafb021ffa28bac2ef88a (diff) | |
| download | git-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.zip git-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.tar.gz git-ab47df2d9a1d07380a02c9be2c57bca1cfbb054e.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 4a4c094..916c9f0 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1034,6 +1034,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge const char *filename; int fd, pos, npos; struct strbuf fetch_head_file = STRBUF_INIT; + const unsigned hexsz = the_hash_algo->hexsz; if (!merge_names) merge_names = &fetch_head_file; @@ -1059,16 +1060,16 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge else npos = merge_names->len; - if (npos - pos < GIT_SHA1_HEXSZ + 2 || + if (npos - pos < hexsz + 2 || get_oid_hex(merge_names->buf + pos, &oid)) 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 */ else { - char saved = merge_names->buf[pos + GIT_SHA1_HEXSZ]; - merge_names->buf[pos + GIT_SHA1_HEXSZ] = '\0'; + char saved = merge_names->buf[pos + hexsz]; + merge_names->buf[pos + hexsz] = '\0'; 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 (ptr) |