Merge branch 'mm/rebase-i-post-rewrite-exec' into maint

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 207b90c7b13e103b29305b68aa99d1b9b09342e7..07fef3cc6b832c257bd3256dc6fff3d4c51760d9 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -22,10 +22,8 @@ static int hash_literally(unsigned char *sha1, int fd, const char *type, unsigne
 
        if (strbuf_read(&buf, fd, 4096) < 0)
                ret = -1;
-       else if (flags & HASH_WRITE_OBJECT)
-               ret = write_sha1_file(buf.buf, buf.len, type, sha1);
        else
-               ret = hash_sha1_file(buf.buf, buf.len, type, sha1);
+               ret = hash_sha1_file_literally(buf.buf, buf.len, type, sha1, flags);
        strbuf_release(&buf);
        return ret;
 }