undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid whitespace on empty line in automatic usage message

Browse Source 
When outputting a usage message with a blank line in the
header, we would output a line with four spaces. Make this
truly a blank line.

This helps us remove trailing whitespace from a test vector.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2008-06-14 03:27:21 -04:00 committed by Junio C Hamano
parent 74f16b0c6f
commit 44d86e910d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parse-options.c
View File

@ -312,8 +312,12 @@ void usage_with_options_internal(const char * const *usagestr,
fprintf(stderr, "usage: %s\n", *usagestr++); fprintf(stderr, "usage: %s\n", *usagestr++);
while (*usagestr && **usagestr) while (*usagestr && **usagestr)
fprintf(stderr, " or: %s\n", *usagestr++); fprintf(stderr, " or: %s\n", *usagestr++);
while (*usagestr) while (*usagestr) {
fprintf(stderr, " %s\n", *usagestr++); fprintf(stderr, "%s%s\n",
**usagestr ? " " : "",
*usagestr);
usagestr++;
}
if (opts->type != OPTION_GROUP) if (opts->type != OPTION_GROUP)
fputc('\n', stderr); fputc('\n', stderr);

2
t/t1502-rev-parse-parseopt.sh
View File

@ -5,7 +5,7 @@ test_description='test git rev-parse --parseopt'
cat > expect.err <<EOF cat > expect.err <<EOF
usage: some-command [options] <args>... usage: some-command [options] <args>...
some-command does foo and bar! some-command does foo and bar!
-h, --help show the help -h, --help show the help