Merge branch 'bw/remote-curl-compressed-responses'

diff --git a/builtin/reset.c b/builtin/reset.c
index 7f1c3f02a302128d6c00c35b8783c1a62353b37a..a862c70fab99290b5faf3e700e88194589583329 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -314,7 +314,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
        unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
        if (unborn) {
                /* reset on unborn branch: treat as reset to empty tree */
-               hashcpy(oid.hash, EMPTY_TREE_SHA1_BIN);
+               oidcpy(&oid, the_hash_algo->empty_tree);
        } else if (!pathspec.nr) {
                struct commit *commit;
                if (get_oid_committish(rev, &oid))