Merge branch 'nd/submodule-unused-vars'

diff --git a/transport.c b/transport.c
index f9343e6dde5bfa3c72a089543d9726529d0f84ba..5a74b609ffad51752ec91cc93c602f00292288d1 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1413,9 +1413,9 @@ static void read_alternate_refs(const char *path,
        fh = xfdopen(cmd.out, "r");
        while (strbuf_getline_lf(&line, fh) != EOF) {
                struct object_id oid;
+               const char *p;
 
-               if (get_oid_hex(line.buf, &oid) ||
-                   line.buf[GIT_SHA1_HEXSZ]) {
+               if (parse_oid_hex(line.buf, &oid, &p) || *p) {
                        warning(_("invalid line while parsing alternate refs: %s"),
                                line.buf);
                        break;