Merge branch 'vv/merge-squash-with-explicit-commit' into maint

diff --git a/archive.h b/archive.h
index a7bdeea2c8bd849718518e2b9c450adabb200b37..e60e3dd31c79f1c04b7afcae8eb5623238e1234f 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -11,7 +11,7 @@ struct archiver_args {
        const char *base;
        size_t baselen;
        struct tree *tree;
-       const unsigned char *commit_sha1;
+       const struct object_id *commit_oid;
        const struct commit *commit;
        timestamp_t time;
        struct pathspec pathspec;