Re: [PATCH] git push: remove incomplete options list from help text
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:34
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] git push: remove incomplete options list from help text · Nanako Shiraishi <hidden>
- 2016-06-15 · Re: [PATCH] git push: remove incomplete options list from help text · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH] git push: remove incomplete options list from help text · Junio C Hamano <hidden>
Nanako Shiraishi [off-list ref] writes:
quoted hunk
'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: しらいし ななこ <redacted> --- ...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 [off-list ref]
Subject: [PATCH] push: fix usage: --tags is incompatible with --all and --mirror
Date: Thu, 15 Oct 2009 18:39:05 +0200
Message-ID: [ref]
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