Merge branch 'jc/add-addremove'

[git.git] / builtin-archive.c

diff --git a/builtin-archive.c b/builtin-archive.c
index d5e3af879e7935ae3d5a6fad11951071e379855e..df9772469681285d69f968b59172c4aaee2eb679 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -7,10 +7,8 @@
 #include "archive.h"
 #include "commit.h"
 #include "tree-walk.h"
-#include "exec_cmd.h"
 #include "pkt-line.h"
 #include "sideband.h"
-#include "attr.h"
 
 static const char archive_usage[] = \
 "git archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";
@@ -185,9 +183,10 @@ int parse_archive_args(int argc, const char **argv, const struct archiver **ar,
        if (!*ar)
                die("Unknown archive format '%s'", format);
 
+       args->compression_level = Z_DEFAULT_COMPRESSION;
        if (compression_level != -1) {
                if ((*ar)->flags & USES_ZLIB_COMPRESSION)
-                       zlib_compression_level = compression_level;
+                       args->compression_level = compression_level;
                else {
                        die("Argument not supported for format '%s': -%d",
                                        format, compression_level);