diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:00 +0900 |
| commit | 99fe1c606925ecd427af6e0338ec18936407ba48 (patch) | |
| tree | 8ed84325c439f2161584e2e3efbc8c68d462d4c3 | |
| parent | Merge branch 'ds/sparse-index-protections' (diff) | |
| parent | rev-parse: fix segfault with missing --path-format argument (diff) | |
| download | tgif-99fe1c606925ecd427af6e0338ec18936407ba48.tar.xz | |
Merge branch 'wm/rev-parse-path-format-wo-arg'
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
| -rw-r--r-- | builtin/rev-parse.c | 2 | ||||
| -rwxr-xr-x | t/t1500-rev-parse.sh | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 85bad9052e..7af8dab8bc 100644 --- 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 index deae916707..1c2df08333 100755 --- 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 && |