summaryrefslogtreecommitdiff
path: root/builtin-rev-parse.c
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2008-02-25 23:07:39 -0500
committerJunio C Hamano <gitster@pobox.com>2008-02-25 21:40:12 -0800
commite103343644188ddddb3678f0568d150ca56f59e3 (patch)
tree90bd52d7f2b9cf74eb62b80da5acb0065fae4cd6 /builtin-rev-parse.c
parent1468bd47833c6ec3c85620d6af1d910e9378f714 (diff)
downloadgit-e103343644188ddddb3678f0568d150ca56f59e3.tar.gz
rev-parse: fix potential bus error with --parseopt option spec handling
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-rev-parse.c')
-rw-r--r--builtin-rev-parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index b9af1a5a55..90dbb9d7c1 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;
}