use -h for synopsis and --help for manpage consistently

A few scripted Porcelain implementations pretend as if the routine to show
their own help messages are triggered upon "git cmd --help", but a command
line parser of "git" will hijack such a request and shows the manpage for
the cmd subcommand.

Leaving the code to handle such input is simply misleading.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Clemens Buchacher 2011-10-03 20:21:36 +02:00 коммит произвёл Junio C Hamano
Родитель 703f05ad58
Коммит 87182b17ed
6 изменённых файлов: 6 добавлений и 7 удалений

Просмотреть файл

@ -117,5 +117,4 @@ commit. And the default value is 40. If there are more than one
take effect.
-h::
--help::
Show help message.

Просмотреть файл

@ -109,14 +109,14 @@ my $usage =
" --strict-paths : Don't allow recursing into subdirectories\n".
" --export-all : Don't check for gitcvs.enabled in config\n".
" --version, -V : Print version information and exit\n".
" --help, -h, -H : Print usage information and exit\n".
" -h, -H : Print usage information and exit\n".
"\n".
"<directory> ... is a list of allowed directories. If no directories\n".
"are given, all are allowed. This is an additional restriction, gitcvs\n".
"access still needs to be enabled by the gitcvs.enabled config option.\n".
"Alternately, one directory may be specified in GIT_CVSSERVER_ROOT.\n";
my @opts = ( 'help|h|H', 'version|V',
my @opts = ( 'h|H', 'version|V',
'base-path=s', 'strict-paths', 'export-all' );
GetOptions( $state, @opts )
or die $usage;

Просмотреть файл

@ -97,7 +97,7 @@ sub generate_command
$prompt = 'yes';
next;
}
if ($arg eq '-h' || $arg eq '--help') {
if ($arg eq '-h') {
usage();
}
push @command, $arg;

Просмотреть файл

@ -120,7 +120,7 @@ do
--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
dry_run=--dry-run
;;
-h|--h|--he|--hel|--help|--help-|--help-a|--help-al|--help-all)
-h|--help-all)
usage
;;
*)

Просмотреть файл

@ -90,7 +90,7 @@ $LONG_USAGE"
fi
case "$1" in
-h|--h|--he|--hel|--help)
-h)
echo "$LONG_USAGE"
exit
esac

Просмотреть файл

@ -299,7 +299,7 @@ read_git_config(\%opts);
if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
Getopt::Long::Configure('pass_through');
}
my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
my $rv = GetOptions(%opts, 'h|H' => \$_help, 'version|V' => \$_version,
'minimize-connections' => \$Git::SVN::Migration::_minimize,
'id|i=s' => \$Git::SVN::default_ref_id,
'svn-remote|remote|R=s' => sub {