{"thread":{"id":"7584","subject":"[PATCH] git-archive: make tar the default format","startedAt":"2007-04-09T15:12:53Z","lastAt":"2007-04-09T15:12:53Z","messageCount":1,"participants":["René Scharfe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"38936","messageId":"461A57F5.7080403@lsrfire.ath.cx","threadId":"7584","inReplyTo":null,"subject":"[PATCH] git-archive: make tar the default format","fromName":"René Scharfe","fromEmail":"rene.scharfe@lsrfire.ath.cx","sentAt":"2007-04-09T15:12:53Z","receivedAt":"2007-04-09T15:12:53Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"As noted by Junio, --format=tar should be assumed if no format\nwas specified.\n\nSigned-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>\n---\n Documentation/git-archive.txt |    3 ++-\n builtin-archive.c             |    4 +---\n t/t5000-tar-tree.sh           |   10 +++++++++-\n 3 files changed, 12 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt\nindex 493474b..8d10415 100644\n--- a/Documentation/git-archive.txt\n+++ b/Documentation/git-archive.txt\n@@ -30,7 +30,8 @@ OPTIONS\n -------\n \n --format=<fmt>::\n-\tFormat of the resulting archive: 'tar', 'zip'...\n+\tFormat of the resulting archive: 'tar', 'zip'...  The default\n+\tis 'tar'.\n \n --list::\n \tShow all available formats.\ndiff --git a/builtin-archive.c b/builtin-archive.c\nindex 8ea6cb1..7f4e409 100644\n--- a/builtin-archive.c\n+++ b/builtin-archive.c\n@@ -149,7 +149,7 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)\n {\n \tconst char *extra_argv[MAX_EXTRA_ARGS];\n \tint extra_argc = 0;\n-\tconst char *format = NULL; /* might want to default to \"tar\" */\n+\tconst char *format = \"tar\";\n \tconst char *base = \"\";\n \tint verbose = 0;\n \tint i;\n@@ -190,8 +190,6 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)\n \t/* We need at least one parameter -- tree-ish */\n \tif (argc - 1 < i)\n \t\tusage(archive_usage);\n-\tif (!format)\n-\t\tdie(\"You must specify an archive format\");\n \tif (init_archiver(format, ar) < 0)\n \t\tdie(\"Unknown archive format '%s'\", format);\n \ndiff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh\nindex b4359df..e223c07 100755\n--- a/t/t5000-tar-tree.sh\n+++ b/t/t5000-tar-tree.sh\n@@ -50,8 +50,16 @@ test_expect_success \\\n      git-commit-tree $treeid </dev/null)'\n \n test_expect_success \\\n+    'git-archive' \\\n+    'git-archive HEAD >b.tar'\n+\n+test_expect_success \\\n     'git-tar-tree' \\\n-    'git-tar-tree HEAD >b.tar'\n+    'git-tar-tree HEAD >b2.tar'\n+\n+test_expect_success \\\n+    'git-archive vs. git-tar-tree' \\\n+    'diff b.tar b2.tar'\n \n test_expect_success \\\n     'validate file modification time' \\\n-- \n1.5.1.53.g77e6f\n"}]}