From: Junio C Hamano <gitster@pobox.com>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>,
Sebastian Pipping <webmaster@hartwork.org>,
Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH] git push: remove incomplete options list from help text
Date: Sun, 18 Oct 2009 20:13:03 -0700 [thread overview]
Message-ID: <7vpr8kcc00.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20091019115412.6117@nanako3.lavabit.com> (Nanako Shiraishi's message of "Mon\, 19 Oct 2009 11\:54\:12 +0900")
Nanako Shiraishi <nanako3@lavabit.com> writes:
> 'git push -h' shows usage text with incomplete list of options and then
> has a separate list of options that are supported. Imitate the way other
> commands (I looked at 'git diff' for an example) show their options.
>
> Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
> ---
> ...
> diff --git a/builtin-push.c b/builtin-push.c
> index 3cb1ee4..6686b79 100644
> --- a/builtin-push.c
> +++ b/builtin-push.c
> @@ -10,7 +10,7 @@
> #include "parse-options.h"
>
> static const char * const push_usage[] = {
> - "git push [--all | --mirror] [-n | --dry-run] [--porcelain] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]",
> + "git push <options> [<repository> <refspec>...]",
> NULL,
> };
>
> --
> 1.6.5.rc1.18.g53a9a
Sounds like a sane thing to do, but I am sort of surprised that you are
still on 1.6.5-rc1 ;-)
How does this interact with one of the "unapplied patch" you reminded me
of, namely, this one:
From: Björn Gustavsson <bgustavsson@gmail.com>
Subject: [PATCH] push: fix usage: --tags is incompatible with --all and --mirror
Date: Thu, 15 Oct 2009 18:39:05 +0200
Message-ID: <4AD75029.1010109@gmail.com>
Correct the usage text to make it clear that --tags cannot
be combined with --all or --mirror.
The option description that comes from parse-options may need to be
updated as well, no?
> -q, --quiet be quiet
> -v, --verbose be verbose
> --repo <repository> repository
> --all push all refs
> --mirror mirror all refs
> --tags push tags
> -n, --dry-run dry run
> --porcelain machine-readable output
> -f, --force force updates
> --thin use thin pack
> --receive-pack <receive-pack>
> receive pack program
> --exec <receive-pack>
> receive pack program
next prev parent reply other threads:[~2009-10-19 3:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-11 8:40 [ANNOUNCE] GIT 1.6.5 Junio C Hamano
2009-10-11 16:30 ` Steven Noonan
2009-10-11 16:30 ` Steven Noonan
2009-10-11 18:47 ` Junio C Hamano
2009-10-11 18:57 ` Steven Noonan
2009-10-14 22:11 ` Jakub Narebski
2009-10-18 17:05 ` Sebastian Pipping
2009-10-18 23:52 ` [PATCH] Document git push -q Miklos Vajna
2009-10-19 2:54 ` [PATCH] git push: remove incomplete options list from help text Nanako Shiraishi
2009-10-19 3:13 ` Junio C Hamano [this message]
2009-10-19 3:57 ` [PATCH] git push: say that --tag can't be used with --all or --mirror in " Nanako Shiraishi
2009-10-19 4:14 ` Jeff King
2009-10-21 14:42 ` Jeff King
2009-10-21 21:21 ` Nanako Shiraishi
2009-10-19 4:10 ` [PATCH] git push: remove incomplete options list from " Jeff King
2009-10-19 5:41 ` Junio C Hamano
2009-10-19 4:01 ` [PATCH] Document git push -q Jeff King
2009-10-19 5:58 ` Junio C Hamano
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=7vpr8kcc00.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=peff@peff.net \
--cc=vmiklos@frugalware.org \
--cc=webmaster@hartwork.org \
/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).