From: brian m. carlson Date: Tue, 12 Feb 2019 01:22:40 GMT Subject: [PATCH 15/31] builtin/pull: make hash-size independent Message-ID: <20190212012256.1005924-16-sandals@crustytoothpaste.net> In-Reply-To: <20190212012256.1005924-1-sandals@crustytoothpaste.net> Instead of using get_oid_hex and GIT_SHA1_HEXSZ, use parse_oid_hex to avoid the need for a constant and simplify the code. Signed-off-by: brian m. carlson --- builtin/pull.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 701d1473dc..52d93c1e3b 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -365,9 +365,10 @@ static void get_merge_heads(struct oid_array *merge_heads) fp = xfopen(filename, "r"); while (strbuf_getline_lf(&sb, fp) != EOF) { - if (get_oid_hex(sb.buf, &oid)) + const char *p; + if (parse_oid_hex(sb.buf, &oid, &p)) continue; /* invalid line: does not start with SHA1 */ - if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t")) + if (starts_with(p, "\tnot-for-merge\t")) continue; /* ref is not-for-merge */ oid_array_append(merge_heads, &oid); }