Merge branch '2.16' of https://github.com/ChrisADR/git-po

[thirdparty/git.git] / archive.c

diff --git a/archive.c b/archive.c
index f81bd3649a1f4bf20bc03100d12fc157401bdc14..0b7b62af0c3ecee10a26e9bd2d274690604ffcad 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -371,12 +371,12 @@ static void parse_treeish_arg(const char **argv,
                const char *colon = strchrnul(name, ':');
                int refnamelen = colon - name;
 
-               if (!dwim_ref(name, refnamelen, oid.hash, &ref))
+               if (!dwim_ref(name, refnamelen, &oid, &ref))
                        die("no such ref: %.*s", refnamelen, name);
                free(ref);
        }
 
-       if (get_sha1(name, oid.hash))
+       if (get_oid(name, &oid))
                die("Not a valid object name");
 
        commit = lookup_commit_reference_gently(&oid, 1);