Merge branch 'wm/rev-parse-path-format-wo-arg'

gitster · gitster · commit 99fe1c606925 · 2021-05-22T18:29:00.000+09:00
The "rev-parse" command did not diagnose the lack of argument to
"--path-format" option, which was introduced in v2.31 era, which
has been corrected.

* wm/rev-parse-path-format-wo-arg:
  rev-parse: fix segfault with missing --path-format argument
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
@@ -759,6 +759,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				continue;
 			}
 			if (opt_with_value(arg, "--path-format", &arg)) {
+				if (!arg)
+					die("--path-format requires an argument");
 				if (!strcmp(arg, "absolute")) {
 					format = FORMAT_CANONICAL;
 				} else if (!strcmp(arg, "relative")) {
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
@@ -146,6 +146,10 @@ test_expect_success '--path-format can change in the middle of the command line'
 	test_cmp expect actual
 '
 
+test_expect_success '--path-format does not segfault without an argument' '
+	test_must_fail git rev-parse --path-format
+'
+
 test_expect_success 'git-common-dir from worktree root' '
 	echo .git >expect &&
 	git rev-parse --git-common-dir >actual &&

Original file line number	Diff line number	Diff line change
`@@ -759,6 +759,8 @@ int cmd_rev_parse(int argc, const char *argv, const char prefix)`
`759`	`759`	`continue;`
`760`	`760`	`}`
`761`	`761`	`if (opt_with_value(arg, "--path-format", &arg)) {`
	`762`	`+ if (!arg)`
	`763`	`+ die("--path-format requires an argument");`
`762`	`764`	`if (!strcmp(arg, "absolute")) {`
`763`	`765`	`format = FORMAT_CANONICAL;`
`764`	`766`	`} else if (!strcmp(arg, "relative")) {`