From: Jeff King <peff@peff.net>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: Junio C Hamano <gitster@pobox.com>,
"J.H." <warthog19@eaglescrag.net>,
git@vger.kernel.org, git-dev@github.com
Subject: [PATCH 4/7] archive: advertise user tar-filters in --list
Date: Wed, 15 Jun 2011 18:33:32 -0400 [thread overview]
Message-ID: <20110615223332.GD16807@sigill.intra.peff.net> (raw)
In-Reply-To: <20110615223030.GA16110@sigill.intra.peff.net>
These can be selected by --format, so we need to let users
know about them. It is especially important for the remote
case, since this is the only method by which users can find
out which formats the remote has configured.
Signed-off-by: Jeff King <peff@peff.net>
---
archive.c | 3 +++
t/t5000-tar-tree.sh | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/archive.c b/archive.c
index cf58faa..a987936 100644
--- a/archive.c
+++ b/archive.c
@@ -358,8 +358,11 @@ static int parse_archive_args(int argc, const char **argv,
base = "";
if (list) {
+ struct tar_filter *p;
for (i = 0; i < ARRAY_SIZE(archivers); i++)
printf("%s\n", archivers[i].name);
+ for (p = tar_filters; p; p = p->next)
+ printf("%s\n", p->name);
exit(0);
}
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 2b2b128..9f959b1 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -267,12 +267,12 @@ test_expect_success 'filters can allow compression levels' '
test_cmp expect output
'
-test_expect_failure 'archive --list mentions user filter' '
+test_expect_success 'archive --list mentions user filter' '
git archive --list >output &&
grep "^fake\$" output
'
-test_expect_failure 'archive --list shows remote user filters' '
+test_expect_success 'archive --list shows remote user filters' '
git archive --list --remote=. >output &&
grep "^fake\$" output
'
--
1.7.6.rc1.4.g49204
next prev parent reply other threads:[~2011-06-15 22:33 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-14 18:17 [PATCH 1/2] archive: factor out write phase of tar format Jeff King
2011-06-14 18:18 ` [PATCH 2/2] archive: support gzipped tar files Jeff King
2011-06-14 19:25 ` J.H.
2011-06-14 19:30 ` Jeff King
2011-06-14 19:39 ` René Scharfe
2011-06-14 20:14 ` Jeff King
2011-06-14 20:45 ` Jeff King
2011-06-15 22:30 ` [RFC/PATCH 0/7] user-configurable git-archive output formats Jeff King
2011-06-15 22:31 ` [PATCH 1/7] archive: reorder option parsing and config reading Jeff King
2011-06-15 22:33 ` [PATCH 2/7] archive: add user-configurable tar-filter infrastructure Jeff King
2011-06-15 23:33 ` Junio C Hamano
2011-06-16 0:29 ` Jeff King
2011-06-15 22:33 ` [PATCH 3/7] archive: support user tar-filters via --format Jeff King
2011-06-15 22:33 ` Jeff King [this message]
2011-06-15 22:34 ` [PATCH 5/7] archive: refactor format-guessing from filename Jeff King
2011-06-15 23:48 ` Junio C Hamano
2011-06-16 0:34 ` Jeff King
2011-06-15 22:34 ` [PATCH 6/7] archive: match extensions from user-configured formats Jeff King
2011-06-15 22:35 ` [PATCH 7/7] archive: provide builtin .tar.gz filter Jeff King
2011-06-15 23:55 ` Junio C Hamano
2011-06-15 23:57 ` Junio C Hamano
2011-06-16 0:38 ` Jeff King
2011-06-16 6:27 ` Junio C Hamano
2011-06-16 6:51 ` Jeff King
2011-06-16 7:56 ` Chris Webb
2011-06-16 17:46 ` Jeff King
2011-06-16 18:02 ` Junio C Hamano
2011-06-16 18:21 ` Jeff King
2011-06-16 18:27 ` John Szakmeister
2011-06-16 18:42 ` Junio C Hamano
2011-06-16 18:57 ` Jeff King
2011-06-18 14:52 ` [RFC/PATCH 0/7] user-configurable git-archive output formats René Scharfe
2011-06-18 15:28 ` Jakub Narebski
2011-06-20 15:58 ` Junio C Hamano
2011-06-22 1:19 ` [PATCHv2 0/9] configurable tar compressors Jeff King
2011-06-22 1:20 ` [PATCHv2 1/9] archive: reorder option parsing and config reading Jeff King
2011-06-22 1:22 ` [PATCHv2 2/9] archive-tar: don't reload default config options Jeff King
2011-06-22 1:23 ` [PATCHv2 3/9] archive: refactor list of archive formats Jeff King
2011-06-23 17:05 ` Thiago Farina
2011-06-23 17:30 ` Jeff King
2011-06-22 1:24 ` [PATCHv2 4/9] archive: pass archiver struct to write_archive callback Jeff King
2011-06-22 1:24 ` [PATCHv2 5/9] archive: move file extension format-guessing lower Jeff King
2011-06-22 1:25 ` [PATCHv2 6/9] archive: refactor file extension format-guessing Jeff King
2011-06-22 1:26 ` [PATCHv2 7/9] archive: implement configurable tar filters Jeff King
2011-06-22 1:45 ` Jeff King
2011-06-22 6:09 ` René Scharfe
2011-06-22 14:59 ` Jeff King
2011-06-22 1:27 ` [PATCHv2 8/9] archive: provide builtin .tar.gz filter Jeff King
2011-06-22 1:35 ` [PATCHv2 9/9] upload-archive: allow user to turn off filters Jeff King
2011-06-22 3:17 ` Jeff King
2011-06-21 16:01 ` [RFC/PATCH 0/7] user-configurable git-archive output formats Jeff King
2011-06-18 15:40 ` René Scharfe
2011-06-14 20:30 ` [PATCH 2/2] archive: support gzipped tar files Junio C Hamano
2011-06-14 20:49 ` Jeff King
2011-06-14 23:40 ` Miles Bader
2011-06-15 22:46 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110615223332.GD16807@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git-dev@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=warthog19@eaglescrag.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).