[PATCH v2 1/3] archive: add shortcuts for --format and --prefix
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:46:35
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- Documentation/git-archive.txt | 4 +++- archive.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index c1adf59..2e31142 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt@@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree SYNOPSIS -------- [verse] -'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>] +'git archive' [-f <fmt>|--format=<fmt>] [--list] [-p <prefix>/|--prefix=<prefix>/] [<extra>] [--output=<file>] [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> [path...]
@@ -33,6 +33,7 @@ comment. OPTIONS ------- +-f <fmt>:: --format=<fmt>:: Format of the resulting archive: 'tar' or 'zip'. The default is 'tar'.
@@ -45,6 +46,7 @@ OPTIONS --verbose:: Report progress to stderr. +-p <prefix>/:: --prefix=<prefix>/:: Prepend <prefix>/ to each filename in the archive.
diff --git a/archive.c b/archive.c
index 96b62d4..e87fed7 100644
--- a/archive.c
+++ b/archive.c@@ -260,8 +260,8 @@ static int parse_archive_args(int argc, const char **argv, int list = 0; struct option opts[] = { OPT_GROUP(""), - OPT_STRING(0, "format", &format, "fmt", "archive format"), - OPT_STRING(0, "prefix", &base, "prefix", + OPT_STRING('f', "format", &format, "fmt", "archive format"), + OPT_STRING('p', "prefix", &base, "prefix", "prepend prefix to each pathname in the archive"), OPT_STRING(0, "output", &output, "file", "write the archive to this file"),
--
1.6.2.2.602.g83ee9f