From 44d86e910d61dab4f059d86705599bbb2747b10f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 14 Jun 2008 03:27:21 -0400 Subject: [PATCH] avoid whitespace on empty line in automatic usage message 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 Signed-off-by: Junio C Hamano --- parse-options.c | 8 ++++++-- t/t1502-rev-parse-parseopt.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/parse-options.c b/parse-options.c index acf3fe3a1a..8071711e5d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -312,8 +312,12 @@ void usage_with_options_internal(const char * const *usagestr, fprintf(stderr, "usage: %s\n", *usagestr++); while (*usagestr && **usagestr) fprintf(stderr, " or: %s\n", *usagestr++); - while (*usagestr) - fprintf(stderr, " %s\n", *usagestr++); + while (*usagestr) { + fprintf(stderr, "%s%s\n", + **usagestr ? " " : "", + *usagestr); + usagestr++; + } if (opts->type != OPTION_GROUP) fputc('\n', stderr); diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index d24a47d114..7cdd70a188 100755 --- a/t/t1502-rev-parse-parseopt.sh +++ b/t/t1502-rev-parse-parseopt.sh @@ -5,7 +5,7 @@ test_description='test git rev-parse --parseopt' cat > expect.err <... - + some-command does foo and bar! -h, --help show the help -- 2.11.4.GIT