While in archive.c, it says "pathspec". It's not really pathspec.
Make a few tests to catch this point.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
archive.c | 17 +++++++++++++++++
t/t0024-crlf-archive.sh | 30 +++++++++++++++++++++++++++++-
2 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/archive.c b/archive.c
index e87fed7..5b54d95 100644
--- a/archive.c
+++ b/archive.c
@@ -15,6 +15,8 @@ static char const * const archive_usage[] = {
#define USES_ZLIB_COMPRESSION 1
+static int list_archive(struct archiver_args *args);
+
static const struct archiver {
const char *name;
write_archive_fn_t write_archive;
@@ -22,8 +24,23 @@ static const struct archiver {
} archivers[] = {
{ "tar", write_tar_archive },
{ "zip", write_zip_archive, USES_ZLIB_COMPRESSION },
+ { "dump-file-list", list_archive },
};
+static int list_archive_entry(struct archiver_args *args,
+ const unsigned char *sha1, const char *path, size_t pathlen,
+ unsigned int mode, void *buffer, unsigned long size)
+{
+ printf("%s\n", path);
+ return 0;
+}
+
+static int list_archive(struct archiver_args *args)
+{
+ write_archive_entries(args, list_archive_entry);
+ return 0;
+}
+
static void format_subst(const struct commit *commit,
const char *src, size_t len,
struct strbuf *buf)
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 9c56e0e..695ad5a 100755
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -9,14 +9,42 @@ test_expect_success setup '
git config core.autocrlf true
+ mkdir sub &&
printf "CRLF line ending\r\nAnd another\r\n" > sample &&
- git add sample &&
+ cp sample sub/sample &&
+ git add sample sub/sample &&
test_tick &&
git commit -m Initial
'
+cat <<\EOF > expected
+sample
+sub/
+sub/sample
+EOF
+
+test_expect_success 'archive without subdir' '
+ git archive --format=dump-file-list HEAD > output &&
+ test_cmp output expected
+'
+
+cat <<\EOF > expected
+sub/
+sub/sample
+EOF
+
+test_expect_success 'archive with subdir' '
+ git archive --format=dump-file-list HEAD sub > output &&
+ test_cmp output expected
+'
+
+test_expect_success 'subdir is not pathspec' '
+ test "$(git archive --format=dump-file-list HEAD sub/)" = ""
+ test "$(git archive --format=dump-file-list HEAD s\*)" = ""
+'
+
test_expect_success 'tar archive' '
git archive --format=tar HEAD |
--
1.6.2.2.602.g83ee9f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html