@matheusbsbs / matheus-bagliano / commits / 00436bf1b1

archive: initialize archivers earlier

Initialize archivers as soon as possible when running git-archive. Various non-obvious behavior depends on having the archivers initialized, such as determining the desired archival format from the provided filename. Since 08716b3c11 ("archive: refactor file extension format-guessing", 2011-06-21), archive_format_from_filename() has used the registered archivers to match filenames (provided via --output) to archival formats. However, when git-archive is executed with --remote, format detection happens before the archivers have been registered. This causes archives from remotes to always be generated as TAR files, regardless of the actual filename (unless an explicit --format is provided). This patch fixes that behavior; archival format is determined properly from the output filename, even when --remote is used. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Josh Steadmon committed Oct 25, 2018 at 13:32 UTC 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4
6 files changed +23 -4
archive.c
+6 -3
@@ -29,6 +29,12 @@ void register_archiver(struct archiver *ar)
29 archivers[nr_archivers++] = ar;
30 }
31
32 +void init_archivers(void)
33 +{
34 + init_tar_archiver();
35 + init_zip_archiver();
36 +}
37 +
38 static void format_subst(const struct commit *commit,
39 const char *src, size_t len,
40 struct strbuf *buf)
@@ -531,9 +537,6 @@ int write_archive(int argc, const char **argv, const char *prefix,
537 git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable);
538 git_config(git_default_config, NULL);
539
534 - init_tar_archiver();
535 - init_zip_archiver();
536 -
540 args.repo = repo;
541 argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
542 if (!startup_info->have_repository) {
archive.h
+1
@@ -43,6 +43,7 @@ extern void register_archiver(struct archiver *);
43
44 extern void init_tar_archiver(void);
45 extern void init_zip_archiver(void);
46 +extern void init_archivers(void);
47
48 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
49 const struct object_id *oid,
builtin/archive.c
+2
@@ -97,6 +97,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
97 argc = parse_options(argc, argv, prefix, local_opts, NULL,
98 PARSE_OPT_KEEP_ALL);
99
100 + init_archivers();
101 +
102 if (output)
103 create_output_file(output);
104
builtin/upload-archive.c
+2
@@ -28,6 +28,8 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
28 if (!enter_repo(argv[1], 0))
29 die("'%s' does not appear to be a git repository", argv[1]);
30
31 + init_archivers();
32 +
33 /* put received options in sent_argv[] */
34 argv_array_push(&sent_argv, "git-upload-archive");
35 for (;;) {
t/t5000-tar-tree.sh
+6
@@ -206,6 +206,12 @@ test_expect_success 'git archive with --output, override inferred format' '
206 test_cmp_bin b.tar d4.zip
207 '
208
209 +test_expect_success GZIP 'git archive with --output and --remote creates .tgz' '
210 + git archive --output=d5.tgz --remote=. HEAD &&
211 + gzip -d -c <d5.tgz >d5.tar &&
212 + test_cmp_bin b.tar d5.tar
213 +'
214 +
215 test_expect_success 'git archive --list outside of a git repo' '
216 nongit git archive --list
217 '
t/t5003-archive-zip.sh
+6 -1
@@ -158,11 +158,16 @@ test_expect_success 'git archive --format=zip with --output' \
158 'git archive --format=zip --output=d2.zip HEAD &&
159 test_cmp_bin d.zip d2.zip'
160
161 -test_expect_success 'git archive with --output, inferring format' '
161 +test_expect_success 'git archive with --output, inferring format (local)' '
162 git archive --output=d3.zip HEAD &&
163 test_cmp_bin d.zip d3.zip
164 '
165
166 +test_expect_success 'git archive with --output, inferring format (remote)' '
167 + git archive --remote=. --output=d4.zip HEAD &&
168 + test_cmp_bin d.zip d4.zip
169 +'
170 +
171 test_expect_success \
172 'git archive --format=zip with prefix' \
173 'git archive --format=zip --prefix=prefix/ HEAD >e.zip'