Re: [PATCH] git: avoid segfault on "git --shallow-file" without a value
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Aug 12, 2026, 11:22 UTC
- Message-ID
- <anxXbnuRt4I4uPdI@pks.im>
- In-Reply-To
- <20260811121446.2080190-1-christian.couder@gmail.com>
On Tue, Aug 11, 2026 at 02:14:46PM +0200, Christian Couder wrote:
Show 14 quoted lines
> diff --git a/git.c b/git.c
> index e5f1811b6b..96df15b5cd 100644
> --- a/git.c
> +++ b/git.c
> @@ -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);Should we maybe condense this into a single line?
usage(_("no file given for '%s' option\n")), "--shallow-file")I think that also printing the usage string is only distracting and doesn't really give the user a lot of extra context.
Other than that this patch looks good to me, thanks!
Patrick