From: Dmitry Potapov <dpotapov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, John Tapsell <johnflux@gmail.com>
Subject: [PATCH v2 1/2] git-archive: add '-o' as a alias for '--output'
Date: Mon, 14 Sep 2009 00:13:36 +0400 [thread overview]
Message-ID: <20090913201336.GG30385@dpotapov.dyndns.org> (raw)
In-Reply-To: <7v4or6sngc.fsf@alter.siamese.dyndns.org>
The '-o' option is commonly used in many tools to specify the output file.
Typing '--output' every time is a bit too long to be a practical alternative
to redirecting output. But specifying the output name has the advantage of
making possible to guess the desired output format by filename extension.
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
---
On Sun, Sep 13, 2009 at 11:34:43AM -0700, Junio C Hamano wrote:
> I think this patch is very reasonable, except for this hunk, which would
> want to say "-o <file>::" instead.
Corrected.
Documentation/git-archive.txt | 3 ++-
archive.c | 2 +-
builtin-archive.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 92444dd..1917f2e 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
- [--output=<file>] [--worktree-attributes]
+ [-o | --output=<file>] [--worktree-attributes]
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
[path...]
@@ -48,6 +48,7 @@ OPTIONS
--prefix=<prefix>/::
Prepend <prefix>/ to each filename in the archive.
+-o <file>::
--output=<file>::
Write the archive to <file> instead of stdout.
diff --git a/archive.c b/archive.c
index 0bca9ca..73b8e8a 100644
--- a/archive.c
+++ b/archive.c
@@ -283,7 +283,7 @@ static int parse_archive_args(int argc, const char **argv,
OPT_STRING(0, "format", &format, "fmt", "archive format"),
OPT_STRING(0, "prefix", &base, "prefix",
"prepend prefix to each pathname in the archive"),
- OPT_STRING(0, "output", &output, "file",
+ OPT_STRING('o', "output", &output, "file",
"write the archive to this file"),
OPT_BOOLEAN(0, "worktree-attributes", &worktree_attributes,
"read .gitattributes in working directory"),
diff --git a/builtin-archive.c b/builtin-archive.c
index f9a4bea..565314b 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -71,7 +71,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
const char *output = NULL;
const char *remote = NULL;
struct option local_opts[] = {
- OPT_STRING(0, "output", &output, "file",
+ OPT_STRING('o', "output", &output, "file",
"write the archive to this file"),
OPT_STRING(0, "remote", &remote, "repo",
"retrieve the archive from remote repository <repo>"),
--
1.6.5.rc1.2.g6bb993
next prev parent reply other threads:[~2009-09-13 20:18 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-09 21:27 obnoxious CLI complaints Brendan Miller
2009-09-09 21:54 ` Jakub Narebski
2009-09-09 22:06 ` Wincent Colaiuta
2009-09-10 16:50 ` Jakub Narebski
2009-09-10 18:53 ` Junio C Hamano
2009-09-10 22:19 ` René Scharfe
2009-09-11 3:15 ` Björn Steinbrink
2009-09-10 19:46 ` John Tapsell
2009-09-10 20:17 ` Sverre Rabbelier
2009-09-10 20:23 ` Jakub Narebski
2009-09-10 22:04 ` John Tapsell
2009-09-10 22:49 ` Junio C Hamano
2009-09-10 23:19 ` demerphq
2009-09-11 0:37 ` Junio C Hamano
2009-09-11 0:18 ` John Tapsell
2009-09-11 0:25 ` Junio C Hamano
2009-09-10 0:09 ` Brendan Miller
2009-09-10 1:25 ` Todd Zullinger
2009-09-10 9:16 ` Jakub Narebski
2009-09-10 18:18 ` Eric Schaefer
2009-09-10 18:52 ` Sverre Rabbelier
2009-09-10 22:19 ` René Scharfe
2009-09-11 14:47 ` Linus Torvalds
2009-09-11 22:01 ` René Scharfe
2009-09-11 22:16 ` Linus Torvalds
2009-09-12 10:31 ` Dmitry Potapov
2009-09-12 18:32 ` John Tapsell
2009-09-12 21:44 ` Dmitry Potapov
2009-09-12 22:21 ` John Tapsell
2009-09-12 22:35 ` A Large Angry SCM
2009-09-12 22:43 ` Dmitry Potapov
2009-09-12 23:08 ` John Tapsell
2009-09-13 2:47 ` Junio C Hamano
2009-09-13 17:36 ` [PATCH 1/2] git-archive: add '-o' as a alias for '--output' Dmitry Potapov
2009-09-13 17:36 ` [PATCH 2/2] teach git-archive to auto detect the output format Dmitry Potapov
2009-09-13 18:52 ` Junio C Hamano
2009-09-13 20:17 ` [PATCH v2 " Dmitry Potapov
2009-09-13 21:27 ` Junio C Hamano
2009-09-13 18:34 ` [PATCH 1/2] git-archive: add '-o' as a alias for '--output' Junio C Hamano
2009-09-13 20:13 ` Dmitry Potapov [this message]
2009-09-17 0:48 ` obnoxious CLI complaints Brendan Miller
2009-09-17 1:27 ` Junio C Hamano
2009-09-09 21:58 ` Sverre Rabbelier
2009-09-09 22:58 ` Pierre Habouzit
2009-09-10 1:32 ` Björn Steinbrink
2009-09-10 18:54 ` Matthieu Moy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090913201336.GG30385@dpotapov.dyndns.org \
--to=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johnflux@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).