kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cc/git-shallow-file-wo-value' 

The '--shallow-file' option of 'git' command requires a value, but the
code did not check the presence of a value and instead segfaulted
without one, which has been corrected.

* cc/git-shallow-file-wo-value:
  git: avoid segfault on "git --shallow-file" without a value
main
Junio C Hamano 2026-08-24 13:17:50 -07:00
parent 15b23b50a6 88249755a4
commit 32f49ed9f2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git.c
View File

@ -304,11 +304,15 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
if (envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--shallow-file")) {
(*argv)++;
(*argc)--;
setenv(GIT_SHALLOW_FILE_ENVIRONMENT, (*argv)[0], 1);
if (*argc < 2) {
fprintf(stderr, _("no file given for '%s' option\n" ), "--shallow-file");
usage(git_usage_string);
}
setenv(GIT_SHALLOW_FILE_ENVIRONMENT, (*argv)[1], 1);
if (envchanged)
*envchanged = 1;
(*argv)++;
(*argc)--;
} else if (!strcmp(cmd, "-C")) {
if (*argc < 2) {
fprintf(stderr, _("no directory given for '%s' option\n" ), "-C");

7
t/t0041-usage.sh
View File

@ -107,4 +107,11 @@ test_expect_success 'for-each-ref usage error' '
test_grep "usage" actual.err
'

test_expect_success 'git --shallow-file without a value' '
test_must_fail git --shallow-file >actual 2>actual.err &&
test_line_count = 0 actual &&
test_grep "no file given for " actual.err &&
test_grep "usage" actual.err
'

test_done