зеркало из https://github.com/microsoft/git.git
archive-tar: use internal gzip by default
Drop the dependency on gzip(1) and use our internal implementation to create tar.gz and tgz files. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
23fcf8b09f
Коммит
4f4be00d30
|
@ -148,8 +148,8 @@ tar.<format>.command::
|
|||
to the command (e.g., `-9`).
|
||||
+
|
||||
The `tar.gz` and `tgz` formats are defined automatically and use the
|
||||
command `gzip -cn` by default. An internal gzip implementation can be
|
||||
used by specifying the value `git archive gzip`.
|
||||
magic command `git archive gzip` by default, which invokes an internal
|
||||
implementation of gzip.
|
||||
|
||||
tar.<format>.remote::
|
||||
If true, enable the format for use by remote clients via
|
||||
|
|
|
@ -526,9 +526,9 @@ void init_tar_archiver(void)
|
|||
int i;
|
||||
register_archiver(&tar_archiver);
|
||||
|
||||
tar_filter_config("tar.tgz.command", "gzip -cn", NULL);
|
||||
tar_filter_config("tar.tgz.command", internal_gzip_command, NULL);
|
||||
tar_filter_config("tar.tgz.remote", "true", NULL);
|
||||
tar_filter_config("tar.tar.gz.command", "gzip -cn", NULL);
|
||||
tar_filter_config("tar.tar.gz.command", internal_gzip_command, NULL);
|
||||
tar_filter_config("tar.tar.gz.remote", "true", NULL);
|
||||
git_config(git_tar_config, NULL);
|
||||
for (i = 0; i < nr_tar_filters; i++) {
|
||||
|
|
|
@ -339,21 +339,21 @@ test_expect_success 'only enabled filters are available remotely' '
|
|||
test_cmp_bin remote.bar config.bar
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'git archive --format=tgz' '
|
||||
test_expect_success 'git archive --format=tgz' '
|
||||
git archive --format=tgz HEAD >j.tgz
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'git archive --format=tar.gz' '
|
||||
test_expect_success 'git archive --format=tar.gz' '
|
||||
git archive --format=tar.gz HEAD >j1.tar.gz &&
|
||||
test_cmp_bin j.tgz j1.tar.gz
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'infer tgz from .tgz filename' '
|
||||
test_expect_success 'infer tgz from .tgz filename' '
|
||||
git archive --output=j2.tgz HEAD &&
|
||||
test_cmp_bin j.tgz j2.tgz
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'infer tgz from .tar.gz filename' '
|
||||
test_expect_success 'infer tgz from .tar.gz filename' '
|
||||
git archive --output=j3.tar.gz HEAD &&
|
||||
test_cmp_bin j.tgz j3.tar.gz
|
||||
'
|
||||
|
@ -363,31 +363,31 @@ test_expect_success GZIP 'extract tgz file' '
|
|||
test_cmp_bin b.tar j.tar
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'remote tar.gz is allowed by default' '
|
||||
test_expect_success 'remote tar.gz is allowed by default' '
|
||||
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
||||
test_cmp_bin j.tgz remote.tar.gz
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'remote tar.gz can be disabled' '
|
||||
test_expect_success '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_expect_success 'git archive --format=tgz (internal gzip)' '
|
||||
test_config tar.tgz.command "git archive gzip" &&
|
||||
git archive --format=tgz HEAD >internal_gzip.tgz
|
||||
test_expect_success GZIP 'git archive --format=tgz (external gzip)' '
|
||||
test_config tar.tgz.command "gzip -cn" &&
|
||||
git archive --format=tgz HEAD >external_gzip.tgz
|
||||
'
|
||||
|
||||
test_expect_success 'git archive --format=tar.gz (internal gzip)' '
|
||||
test_config tar.tar.gz.command "git archive gzip" &&
|
||||
git archive --format=tar.gz HEAD >internal_gzip.tar.gz &&
|
||||
test_cmp_bin internal_gzip.tgz internal_gzip.tar.gz
|
||||
test_expect_success GZIP 'git archive --format=tar.gz (external gzip)' '
|
||||
test_config tar.tar.gz.command "gzip -cn" &&
|
||||
git archive --format=tar.gz HEAD >external_gzip.tar.gz &&
|
||||
test_cmp_bin external_gzip.tgz external_gzip.tar.gz
|
||||
'
|
||||
|
||||
test_expect_success GZIP 'extract tgz file (internal gzip)' '
|
||||
gzip -d -c <internal_gzip.tgz >internal_gzip.tar &&
|
||||
test_cmp_bin b.tar internal_gzip.tar
|
||||
test_expect_success GZIP 'extract tgz file (external gzip)' '
|
||||
gzip -d -c <external_gzip.tgz >external_gzip.tar &&
|
||||
test_cmp_bin b.tar external_gzip.tar
|
||||
'
|
||||
|
||||
test_expect_success 'archive and :(glob)' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче