From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Nov 2011 23:04:11 +0000 (-0800)
Subject: Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
X-Git-Tag: v1.7.8.1~5^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b51c33b376d22195dba1c4e067180164fd35dbf?ds=inline;hp=-c

Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive

* jk/maint-1.6.2-upload-archive:
archive: don't let remote clients get unreachable commits

Conflicts:
archive.c
archive.h
builtin-archive.c
builtin/upload-archive.c
t/t5000-tar-tree.sh
---

7b51c33b376d22195dba1c4e067180164fd35dbf
diff --combined archive.c
index 3fd7f475f1,251d69e153..5f0a3fc6d2
--- a/archive.c
+++ b/archive.c
@@@ -4,25 -4,25 +4,25 @@@
  #include "attr.h"
  #include "archive.h"
  #include "parse-options.h"
 +#include "unpack-trees.h"
  
  static char const * const archive_usage[] = {
 -	"git archive [options] <tree-ish> [path...]",
 +	"git archive [options] <tree-ish> [<path>...]",
  	"git archive --list",
 -	"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]",
 +	"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]",
  	"git archive --remote <repo> [--exec <cmd>] --list",
  	NULL
  };
  
 -#define USES_ZLIB_COMPRESSION 1
 +static const struct archiver **archivers;
 +static int nr_archivers;
 +static int alloc_archivers;
  
 -static const struct archiver {
 -	const char *name;
 -	write_archive_fn_t write_archive;
 -	unsigned int flags;
 -} archivers[] = {
 -	{ "tar", write_tar_archive },
 -	{ "zip", write_zip_archive, USES_ZLIB_COMPRESSION },
 -};
 +void register_archiver(struct archiver *ar)
 +{
 +	ALLOC_GROW(archivers, nr_archivers + 1, alloc_archivers);
 +	archivers[nr_archivers++] = ar;
 +}
  
  static void format_subst(const struct commit *commit,
                           const char *src, size_t len,
@@@ -30,9 -30,6 +30,9 @@@
  {
  	char *to_free = NULL;
  	struct strbuf fmt = STRBUF_INIT;
 +	struct pretty_print_context ctx = {0};
 +	ctx.date_mode = DATE_NORMAL;
 +	ctx.abbrev = DEFAULT_ABBREV;
  
  	if (src == buf->buf)
  		to_free = strbuf_detach(buf, NULL);
@@@ -50,7 -47,7 +50,7 @@@
  		strbuf_add(&fmt, b + 8, c - b - 8);
  
  		strbuf_add(buf, src, b - src);
 -		format_commit_message(commit, fmt.buf, buf, DATE_NORMAL);
 +		format_commit_message(commit, fmt.buf, buf, &ctx);
  		len -= c + 1 - src;
  		src  = c + 1;
  	}
@@@ -87,8 -84,8 +87,8 @@@ static void setup_archive_check(struct 
  	static struct git_attr *attr_export_subst;
  
  	if (!attr_export_ignore) {
 -		attr_export_ignore = git_attr("export-ignore", 13);
 -		attr_export_subst = git_attr("export-subst", 12);
 +		attr_export_ignore = git_attr("export-ignore");
 +		attr_export_subst = git_attr("export-subst");
  	}
  	check[0].attr = attr_export_ignore;
  	check[1].attr = attr_export_subst;
@@@ -117,13 -114,12 +117,13 @@@ static int write_archive_entry(const un
  
  	strbuf_reset(&path);
  	strbuf_grow(&path, PATH_MAX);
 +	strbuf_add(&path, args->base, args->baselen);
  	strbuf_add(&path, base, baselen);
  	strbuf_addstr(&path, filename);
  	path_without_prefix = path.buf + args->baselen;
  
  	setup_archive_check(check);
 -	if (!git_checkattr(path_without_prefix, ARRAY_SIZE(check), check)) {
 +	if (!git_check_attr(path_without_prefix, ARRAY_SIZE(check), check)) {
  		if (ATTR_TRUE(check[0].value))
  			return 0;
  		convert = ATTR_TRUE(check[1].value);
@@@ -154,9 -150,6 +154,9 @@@ int write_archive_entries(struct archiv
  		write_archive_entry_fn_t write_entry)
  {
  	struct archiver_context context;
 +	struct unpack_trees_options opts;
 +	struct tree_desc t;
 +	struct pathspec pathspec;
  	int err;
  
  	if (args->baselen > 0 && args->base[args->baselen - 1] == '/') {
@@@ -175,26 -168,8 +175,26 @@@
  	context.args = args;
  	context.write_entry = write_entry;
  
 -	err =  read_tree_recursive(args->tree, args->base, args->baselen, 0,
 -			args->pathspec, write_archive_entry, &context);
 +	/*
 +	 * Setup index and instruct attr to read index only
 +	 */
 +	if (!args->worktree_attributes) {
 +		memset(&opts, 0, sizeof(opts));
 +		opts.index_only = 1;
 +		opts.head_idx = -1;
 +		opts.src_index = &the_index;
 +		opts.dst_index = &the_index;
 +		opts.fn = oneway_merge;
 +		init_tree_desc(&t, args->tree->buffer, args->tree->size);
 +		if (unpack_trees(1, &t, &opts))
 +			return -1;
 +		git_attr_set_direction(GIT_ATTR_INDEX, &the_index);
 +	}
 +
 +	init_pathspec(&pathspec, args->pathspec);
 +	err = read_tree_recursive(args->tree, "", 0, 0, &pathspec,
 +				  write_archive_entry, &context);
 +	free_pathspec(&pathspec);
  	if (err == READ_TREE_RECURSIVE)
  		err = 0;
  	return err;
@@@ -207,47 -182,22 +207,48 @@@ static const struct archiver *lookup_ar
  	if (!name)
  		return NULL;
  
 -	for (i = 0; i < ARRAY_SIZE(archivers); i++) {
 -		if (!strcmp(name, archivers[i].name))
 -			return &archivers[i];
 +	for (i = 0; i < nr_archivers; i++) {
 +		if (!strcmp(name, archivers[i]->name))
 +			return archivers[i];
  	}
  	return NULL;
  }
  
 +static int reject_entry(const unsigned char *sha1, const char *base,
 +			int baselen, const char *filename, unsigned mode,
 +			int stage, void *context)
 +{
 +	return -1;
 +}
 +
 +static int path_exists(struct tree *tree, const char *path)
 +{
 +	const char *paths[] = { path, NULL };
 +	struct pathspec pathspec;
 +	int ret;
 +
 +	init_pathspec(&pathspec, paths);
 +	ret = read_tree_recursive(tree, "", 0, 0, &pathspec, reject_entry, NULL);
 +	free_pathspec(&pathspec);
 +	return ret != 0;
 +}
 +
  static void parse_pathspec_arg(const char **pathspec,
  		struct archiver_args *ar_args)
  {
 -	ar_args->pathspec = get_pathspec(ar_args->base, pathspec);
 +	ar_args->pathspec = pathspec = get_pathspec("", pathspec);
 +	if (pathspec) {
 +		while (*pathspec) {
 +			if (!path_exists(ar_args->tree, *pathspec))
 +				die("path not found: %s", *pathspec);
 +			pathspec++;
 +		}
 +	}
  }
  
  static void parse_treeish_arg(const char **argv,
- 		struct archiver_args *ar_args, const char *prefix)
+ 		struct archiver_args *ar_args, const char *prefix,
+ 		int remote)
  {
  	const char *name = argv[0];
  	const unsigned char *commit_sha1;
@@@ -256,8 -206,17 +257,17 @@@
  	const struct commit *commit;
  	unsigned char sha1[20];
  
- 	if (get_sha1(name, sha1))
- 		die("Not a valid object name");
+ 	/* Remotes are only allowed to fetch actual refs */
+ 	if (remote) {
+ 		char *ref = NULL;
+ 		if (!dwim_ref(name, strlen(name), sha1, &ref))
+ 			die("no such ref: %s", name);
+ 		free(ref);
+ 	}
+ 	else {
+ 		if (get_sha1(name, sha1))
+ 			die("Not a valid object name");
+ 	}
  
  	commit = lookup_commit_reference_gently(sha1, 1);
  	if (commit) {
@@@ -298,29 -257,22 +308,29 @@@
  	  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_HIDDEN, NULL, (p) }
  
  static int parse_archive_args(int argc, const char **argv,
 -		const struct archiver **ar, struct archiver_args *args)
 +		const struct archiver **ar, struct archiver_args *args,
 +		const char *name_hint, int is_remote)
  {
 -	const char *format = "tar";
 +	const char *format = NULL;
  	const char *base = NULL;
  	const char *remote = NULL;
  	const char *exec = NULL;
 +	const char *output = NULL;
  	int compression_level = -1;
  	int verbose = 0;
  	int i;
  	int list = 0;
 +	int worktree_attributes = 0;
  	struct option opts[] = {
  		OPT_GROUP(""),
  		OPT_STRING(0, "format", &format, "fmt", "archive format"),
  		OPT_STRING(0, "prefix", &base, "prefix",
  			"prepend prefix to each pathname in the archive"),
 -		OPT__VERBOSE(&verbose),
 +		OPT_STRING('o', "output", &output, "file",
 +			"write the archive to this file"),
 +		OPT_BOOLEAN(0, "worktree-attributes", &worktree_attributes,
 +			"read .gitattributes in working directory"),
 +		OPT__VERBOSE(&verbose, "report archived files on stderr"),
  		OPT__COMPR('0', &compression_level, "store only", 0),
  		OPT__COMPR('1', &compression_level, "compress faster", 1),
  		OPT__COMPR_HIDDEN('2', &compression_level, 2),
@@@ -342,40 -294,32 +352,40 @@@
  		OPT_END()
  	};
  
 -	argc = parse_options(argc, argv, opts, archive_usage, 0);
 +	argc = parse_options(argc, argv, NULL, opts, archive_usage, 0);
  
  	if (remote)
  		die("Unexpected option --remote");
  	if (exec)
  		die("Option --exec can only be used together with --remote");
 +	if (output)
 +		die("Unexpected option --output");
  
  	if (!base)
  		base = "";
  
  	if (list) {
 -		for (i = 0; i < ARRAY_SIZE(archivers); i++)
 -			printf("%s\n", archivers[i].name);
 +		for (i = 0; i < nr_archivers; i++)
 +			if (!is_remote || archivers[i]->flags & ARCHIVER_REMOTE)
 +				printf("%s\n", archivers[i]->name);
  		exit(0);
  	}
  
 +	if (!format && name_hint)
 +		format = archive_format_from_filename(name_hint);
 +	if (!format)
 +		format = "tar";
 +
  	/* We need at least one parameter -- tree-ish */
  	if (argc < 1)
  		usage_with_options(archive_usage, opts);
  	*ar = lookup_archiver(format);
 -	if (!*ar)
 +	if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE)))
  		die("Unknown archive format '%s'", format);
  
  	args->compression_level = Z_DEFAULT_COMPRESSION;
  	if (compression_level != -1) {
 -		if ((*ar)->flags & USES_ZLIB_COMPRESSION)
 +		if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS)
  			args->compression_level = compression_level;
  		else {
  			die("Argument not supported for format '%s': -%d",
@@@ -385,61 -329,24 +395,61 @@@
  	args->verbose = verbose;
  	args->base = base;
  	args->baselen = strlen(base);
 +	args->worktree_attributes = worktree_attributes;
  
  	return argc;
  }
  
  int write_archive(int argc, const char **argv, const char *prefix,
 -		  int setup_prefix, int remote)
 +		  int setup_prefix, const char *name_hint, int remote)
  {
 +	int nongit = 0;
  	const struct archiver *ar = NULL;
  	struct archiver_args args;
  
 -	argc = parse_archive_args(argc, argv, &ar, &args);
  	if (setup_prefix && prefix == NULL)
 -		prefix = setup_git_directory();
 +		prefix = setup_git_directory_gently(&nongit);
 +
 +	git_config(git_default_config, NULL);
 +	init_tar_archiver();
 +	init_zip_archiver();
 +
 +	argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
 +	if (nongit) {
 +		/*
 +		 * We know this will die() with an error, so we could just
 +		 * die ourselves; but its error message will be more specific
 +		 * than what we could write here.
 +		 */
 +		setup_git_directory();
 +	}
  
- 	parse_treeish_arg(argv, &args, prefix);
+ 	parse_treeish_arg(argv, &args, prefix, remote);
  	parse_pathspec_arg(argv + 1, &args);
  
 -	git_config(git_default_config, NULL);
 +	return ar->write_archive(ar, &args);
 +}
  
 -	return ar->write_archive(&args);
 +static int match_extension(const char *filename, const char *ext)
 +{
 +	int prefixlen = strlen(filename) - strlen(ext);
 +
 +	/*
 +	 * We need 1 character for the '.', and 1 character to ensure that the
 +	 * prefix is non-empty (k.e., we don't match .tar.gz with no actual
 +	 * filename).
 +	 */
 +	if (prefixlen < 2 || filename[prefixlen-1] != '.')
 +		return 0;
 +	return !strcmp(filename + prefixlen, ext);
 +}
 +
 +const char *archive_format_from_filename(const char *filename)
 +{
 +	int i;
 +
 +	for (i = 0; i < nr_archivers; i++)
 +		if (match_extension(filename, archivers[i]->name))
 +			return archivers[i]->name;
 +	return NULL;
  }
diff --combined t/t5000-tar-tree.sh
index d9068981f8,1a2ee105a4..c05c676ca2
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@@ -26,8 -26,6 +26,8 @@@ commit id embedding
  
  . ./test-lib.sh
  UNZIP=${UNZIP:-unzip}
 +GZIP=${GZIP:-gzip}
 +GUNZIP=${GUNZIP:-gzip -d}
  
  SUBSTFORMAT=%H%n
  
@@@ -39,11 -37,7 +39,11 @@@ test_expect_success 
       cp /bin/sh a/bin &&
       printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
       printf "A not substituted O" >a/substfile2 &&
 -     ln -s a a/l1 &&
 +     if test_have_prereq SYMLINKS; then
 +	ln -s a a/l1
 +     else
 +	printf %s a > a/l1
 +     fi &&
       (p=long_path_to_a_file && cd a &&
        for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
        echo text >file_with_long_path) &&
@@@ -52,7 -46,7 +52,7 @@@
  test_expect_success \
      'add ignored file' \
      'echo ignore me >a/ignored &&
 -     echo ignored export-ignore >.gitattributes'
 +     echo ignored export-ignore >.git/info/attributes'
  
  test_expect_success \
      'add files to repository' \
@@@ -66,7 -60,7 +66,7 @@@
  test_expect_success \
      'create bare clone' \
      'git clone --bare . bare.git &&
 -     cp .gitattributes bare.git/info/attributes'
 +     cp .git/info/attributes bare.git/info/attributes'
  
  test_expect_success \
      'remove ignored file' \
@@@ -82,7 -76,7 +82,7 @@@ test_expect_success 
  
  test_expect_success \
      'git archive vs. git tar-tree' \
 -    'diff b.tar b2.tar'
 +    'test_cmp b.tar b2.tar'
  
  test_expect_success \
      'git archive in a bare repo' \
@@@ -92,26 -86,18 +92,26 @@@ test_expect_success 
      'git archive vs. the same in a bare repo' \
      'test_cmp b.tar b3.tar'
  
 +test_expect_success 'git archive with --output' \
 +    'git archive --output=b4.tar HEAD &&
 +    test_cmp b.tar b4.tar'
 +
 +test_expect_success NOT_MINGW 'git archive --remote' \
 +    'git archive --remote=. HEAD >b5.tar &&
 +    test_cmp b.tar b5.tar'
 +
  test_expect_success \
      'validate file modification time' \
      'mkdir extract &&
       "$TAR" xf b.tar -C extract a/a &&
       test-chmtime -v +0 extract/a/a |cut -f 1 >b.mtime &&
       echo "1117231200" >expected.mtime &&
 -     diff expected.mtime b.mtime'
 +     test_cmp expected.mtime b.mtime'
  
  test_expect_success \
      'git get-tar-commit-id' \
      'git get-tar-commit-id <b.tar >b.commitid &&
 -     diff .git/$(git symbolic-ref HEAD) b.commitid'
 +     test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
  
  test_expect_success \
      'extract tar archive' \
@@@ -120,7 -106,7 +120,7 @@@
  test_expect_success \
      'validate filenames' \
      '(cd b/a && find .) | sort >b.lst &&
 -     diff a.lst b.lst'
 +     test_cmp a.lst b.lst'
  
  test_expect_success \
      'validate file contents' \
@@@ -137,7 -123,7 +137,7 @@@ test_expect_success 
  test_expect_success \
      'validate filenames with prefix' \
      '(cd c/prefix/a && find .) | sort >c.lst &&
 -     diff a.lst c.lst'
 +     test_cmp a.lst c.lst'
  
  test_expect_success \
      'validate file contents with prefix' \
@@@ -145,11 -131,10 +145,11 @@@
  
  test_expect_success \
      'create archives with substfiles' \
 -    'echo "substfile?" export-subst >a/.gitattributes &&
 +    'cp .git/info/attributes .git/info/attributes.before &&
 +     echo "substfile?" export-subst >>.git/info/attributes &&
       git archive HEAD >f.tar &&
       git archive --prefix=prefix/ HEAD >g.tar &&
 -     rm a/.gitattributes'
 +     mv .git/info/attributes.before .git/info/attributes'
  
  test_expect_success \
      'extract substfiles' \
@@@ -159,8 -144,8 +159,8 @@@ test_expect_success 
       'validate substfile contents' \
       'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
        >f/a/substfile1.expected &&
 -      diff f/a/substfile1.expected f/a/substfile1 &&
 -      diff a/substfile2 f/a/substfile2
 +      test_cmp f/a/substfile1.expected f/a/substfile1 &&
 +      test_cmp a/substfile2 f/a/substfile2
  '
  
  test_expect_success \
@@@ -171,8 -156,8 +171,8 @@@ test_expect_success 
       'validate substfile contents from archive with prefix' \
       'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
        >g/prefix/a/substfile1.expected &&
 -      diff g/prefix/a/substfile1.expected g/prefix/a/substfile1 &&
 -      diff a/substfile2 g/prefix/a/substfile2
 +      test_cmp g/prefix/a/substfile1.expected g/prefix/a/substfile1 &&
 +      test_cmp a/substfile2 g/prefix/a/substfile2
  '
  
  test_expect_success \
@@@ -187,37 -172,23 +187,37 @@@ test_expect_success 
      'git archive --format=zip vs. the same in a bare repo' \
      'test_cmp d.zip d1.zip'
  
 +test_expect_success 'git archive --format=zip with --output' \
 +    'git archive --format=zip --output=d2.zip HEAD &&
 +    test_cmp d.zip d2.zip'
 +
 +test_expect_success 'git archive with --output, inferring format' '
 +	git archive --output=d3.zip HEAD &&
 +	test_cmp d.zip d3.zip
 +'
 +
 +test_expect_success 'git archive with --output, override inferred format' '
 +	git archive --format=tar --output=d4.zip HEAD &&
 +	test_cmp b.tar d4.zip
 +'
 +
  $UNZIP -v >/dev/null 2>&1
  if [ $? -eq 127 ]; then
 -	echo "Skipping ZIP tests, because unzip was not found"
 -	test_done
 -	exit
 +	say "Skipping ZIP tests, because unzip was not found"
 +else
 +	test_set_prereq UNZIP
  fi
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'extract ZIP archive' \
      '(mkdir d && cd d && $UNZIP ../d.zip)'
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'validate filenames' \
      '(cd d/a && find .) | sort >d.lst &&
 -     diff a.lst d.lst'
 +     test_cmp a.lst d.lst'
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'validate file contents' \
      'diff -r a d/a'
  
@@@ -225,16 -196,16 +225,16 @@@ test_expect_success 
      'git archive --format=zip with prefix' \
      'git archive --format=zip --prefix=prefix/ HEAD >e.zip'
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'extract ZIP archive with prefix' \
      '(mkdir e && cd e && $UNZIP ../e.zip)'
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'validate filenames with prefix' \
      '(cd e/prefix/a && find .) | sort >e.lst &&
 -     diff a.lst e.lst'
 +     test_cmp a.lst e.lst'
  
 -test_expect_success \
 +test_expect_success UNZIP \
      'validate file contents with prefix' \
      'diff -r a e/prefix/a'
  
@@@ -242,114 -213,12 +242,122 @@@ test_expect_success 
      'git archive --list outside of a git repo' \
      'GIT_DIR=some/non-existing/directory git archive --list'
  
+ test_expect_success 'clients cannot access unreachable commits' '
+ 	test_commit unreachable &&
+ 	sha1=`git rev-parse HEAD` &&
+ 	git reset --hard HEAD^ &&
+ 	git archive $sha1 >remote.tar &&
+ 	test_must_fail git archive --remote=. $sha1 >remote.tar
+ '
+ 
 +test_expect_success 'git-archive --prefix=olde-' '
 +	git archive --prefix=olde- >h.tar HEAD &&
 +	(
 +		mkdir h &&
 +		cd h &&
 +		"$TAR" xf - <../h.tar
 +	) &&
 +	test -d h/olde-a &&
 +	test -d h/olde-a/bin &&
 +	test -f h/olde-a/bin/sh
 +'
 +
 +test_expect_success 'setup tar filters' '
 +	git config tar.tar.foo.command "tr ab ba" &&
 +	git config tar.bar.command "tr ab ba" &&
 +	git config tar.bar.remote true
 +'
 +
 +test_expect_success 'archive --list mentions user filter' '
 +	git archive --list >output &&
 +	grep "^tar\.foo\$" output &&
 +	grep "^bar\$" output
 +'
 +
 +test_expect_success NOT_MINGW 'archive --list shows only enabled remote filters' '
 +	git archive --list --remote=. >output &&
 +	! grep "^tar\.foo\$" output &&
 +	grep "^bar\$" output
 +'
 +
 +test_expect_success 'invoke tar filter by format' '
 +	git archive --format=tar.foo HEAD >config.tar.foo &&
 +	tr ab ba <config.tar.foo >config.tar &&
 +	test_cmp b.tar config.tar &&
 +	git archive --format=bar HEAD >config.bar &&
 +	tr ab ba <config.bar >config.tar &&
 +	test_cmp b.tar config.tar
 +'
 +
 +test_expect_success 'invoke tar filter by extension' '
 +	git archive -o config-implicit.tar.foo HEAD &&
 +	test_cmp config.tar.foo config-implicit.tar.foo &&
 +	git archive -o config-implicit.bar HEAD &&
 +	test_cmp config.tar.foo config-implicit.bar
 +'
 +
 +test_expect_success 'default output format remains tar' '
 +	git archive -o config-implicit.baz HEAD &&
 +	test_cmp b.tar config-implicit.baz
 +'
 +
 +test_expect_success 'extension matching requires dot' '
 +	git archive -o config-implicittar.foo HEAD &&
 +	test_cmp b.tar config-implicittar.foo
 +'
 +
 +test_expect_success NOT_MINGW 'only enabled filters are available remotely' '
 +	test_must_fail git archive --remote=. --format=tar.foo HEAD \
 +		>remote.tar.foo &&
 +	git archive --remote=. --format=bar >remote.bar HEAD &&
 +	test_cmp remote.bar config.bar
 +'
 +
 +if $GZIP --version >/dev/null 2>&1; then
 +	test_set_prereq GZIP
 +else
 +	say "Skipping some tar.gz tests because gzip not found"
 +fi
 +
 +test_expect_success GZIP 'git archive --format=tgz' '
 +	git archive --format=tgz HEAD >j.tgz
 +'
 +
 +test_expect_success GZIP 'git archive --format=tar.gz' '
 +	git archive --format=tar.gz HEAD >j1.tar.gz &&
 +	test_cmp j.tgz j1.tar.gz
 +'
 +
 +test_expect_success GZIP 'infer tgz from .tgz filename' '
 +	git archive --output=j2.tgz HEAD &&
 +	test_cmp j.tgz j2.tgz
 +'
 +
 +test_expect_success GZIP 'infer tgz from .tar.gz filename' '
 +	git archive --output=j3.tar.gz HEAD &&
 +	test_cmp j.tgz j3.tar.gz
 +'
 +
 +if $GUNZIP --version >/dev/null 2>&1; then
 +	test_set_prereq GUNZIP
 +else
 +	say "Skipping some tar.gz tests because gunzip was not found"
 +fi
 +
 +test_expect_success GZIP,GUNZIP 'extract tgz file' '
 +	$GUNZIP -c <j.tgz >j.tar &&
 +	test_cmp b.tar j.tar
 +'
 +
 +test_expect_success GZIP,NOT_MINGW 'remote tar.gz is allowed by default' '
 +	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
 +	test_cmp j.tgz remote.tar.gz
 +'
 +
 +test_expect_success GZIP,NOT_MINGW 'remote tar.gz can be disabled' '
 +	git config tar.tar.gz.remote false &&
 +	test_must_fail git archive --remote=. --format=tar.gz HEAD \
 +		>remote.tar.gz
 +'
 +
  test_done