Disallow invalid --pretty= abbreviations

Eric Wong · Junio C Hamano · commit b6936205e73c · 2007-02-02T21:18:59.000-08:00
--pretty=o is a valid abbreviation, --pretty=omfg is not

Noticed by: Nicolas Vilz
Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/commit.c b/commit.c
@@ -47,7 +47,8 @@ enum cmit_fmt get_commit_format(const char *arg)
 	if (*arg == '=')
 		arg++;
 	for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
-		if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))
+		if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
+		    !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
 			return cmt_fmts[i].v;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ enum cmit_fmt get_commit_format(const char *arg)`
`47`	`47`	`if (*arg == '=')`
`48`	`48`	`arg++;`
`49`	`49`	`for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {`
`50`		`- if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))`
	`50`	`+ if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&`
	`51`	`+ !strncmp(arg, cmt_fmts[i].n, strlen(arg)))`
`51`	`52`	`return cmt_fmts[i].v;`
`52`	`53`	`}`
`53`	`54`