[PATCH] rev-parse: fix potential bus error with --parseopt option spec handling

[Jay Soffian <jaysoffian@gmail.com>]

A non-empty line containing no spaces should be treated by --parseopt as
an option group header, but was causing a bus error. Also added a test
script for rev-parse --parseopt.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
e.g.
% printf "foo\n--\noption-group-header\n" | git rev-parse --parseopt -- -h
Bus error

Wasn't sure whether to add the --parseopt test to t0040-parse-options.sh or
t1500-rev-parse.sh. I ended up creating a new test script. Hopefully calling
it out will increase the likelihood of it growing additional --parseopt tests.

 builtin-rev-parse.c           |    2 +-
 t/t1502-rev-parse-parseopt.sh |   43 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)
 create mode 100755 t/t1502-rev-parse-parseopt.sh

diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index b9af1a5..90dbb9d 100644
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -315,7 +315,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 		s = strchr(sb.buf, ' ');
 		if (!s || *sb.buf == ' ') {
 			o->type = OPTION_GROUP;
-			o->help = xstrdup(skipspaces(s));
+			o->help = xstrdup(skipspaces(sb.buf));
 			continue;
 		}
 
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
new file mode 100755
index 0000000..762af5f
--- /dev/null
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+test_description='test git rev-parse --parseopt'
+. ./test-lib.sh
+
+cat > expect.err <<EOF
+usage: some-command [options] <args>...
+    
+    some-command does foo and bar!
+
+    -h, --help            show the help
+    --foo                 some nifty option --foo
+    --bar ...             some cool option --bar with an argument
+
+An option group Header
+    -C [...]              option C with an optional argument
+
+Extras
+    --extra1              line above used to cause a segfault but no longer does
+
+EOF
+
+test_expect_success 'test --parseopt help output' '
+	git rev-parse --parseopt -- -h 2> output.err <<EOF
+some-command [options] <args>...
+
+some-command does foo and bar!
+--
+h,help    show the help
+
+foo       some nifty option --foo
+bar=      some cool option --bar with an argument
+
+ An option group Header
+C?        option C with an optional argument
+
+Extras
+extra1    line above used to cause a segfault but no longer does
+EOF
+	git diff expect.err output.err
+'
+
+test_done
-- 
1.5.4.3.331.ga714