From: Jeff King Date: Sat, 14 Jun 2008 07:27:21 GMT Subject: [PATCH v2 3/5] avoid whitespace on empty line in automatic usage message Message-ID: <20080614072721.GC17536@sigill.intra.peff.net> In-Reply-To: <20080614072214.GA9975@sigill.intra.peff.net> 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 --- This is equivalent to the fix you just posted. 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 acf3fe3..8071711 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 d24a47d..7cdd70a 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 -- 1.5.6.rc2.183.g04614