builtin/merge.c: drop a parameter that is never used

diff --git a/archive.h b/archive.h
index 895afcdc7a00c5f9f16a21f2c9fe361a3e218d37..4a791e1fed4ecb0fc89b309b294acc93793886f0 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -1,6 +1,8 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
+#include "pathspec.h"
+
 struct archiver_args {
        const char *base;
        size_t baselen;
@@ -8,7 +10,7 @@ struct archiver_args {
        const unsigned char *commit_sha1;
        const struct commit *commit;
        time_t time;
-       const char **pathspec;
+       struct pathspec pathspec;
        unsigned int verbose : 1;
        unsigned int worktree_attributes : 1;
        unsigned int convert : 1;