Merge branch 'jc/gettext-test-fix'

diff --git a/archive.h b/archive.h
index 21ac010699f034e7c8278a22d5387adf74b83ec8..dd022a6b46bc339d19b1c49ebc20214dd137685f 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;