Re: [PATCH v3 2/3] builtin/commit: error out when passing untracked path with -i

From: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 2/3] builtin/commit: error out when passing untracked path with -i
Date: Wed, 3 Apr 2024 03:28:43 +0530	[thread overview]
Message-ID: <gvb4jewvfu733mnrqvna4ulbinep5cjs5b4tw5vr2zet7p2bky@2hg2nmq6gnvz> (raw)
In-Reply-To: <xmqqmsqb30a1.fsf@gitster.g>

On Tue, 02 Apr 2024, Junio C Hamano <gitster@pobox.com> wrote:
> Ghanshyam Thakkar <shyamthakkar001@gmail.com> writes:
> 
> > diff --git a/builtin/commit.c b/builtin/commit.c
> > index 8f31decc6b..09c48a835a 100644
> > --- a/builtin/commit.c
> > +++ b/builtin/commit.c
> > @@ -441,10 +441,17 @@ static const char *prepare_index(const char **argv, const char *prefix,
> >  	 * (B) on failure, rollback the real index.
> >  	 */
> >  	if (all || (also && pathspec.nr)) {
> > +		char *ps_matched = xcalloc(pathspec.nr, 1);
> >  		repo_hold_locked_index(the_repository, &index_lock,
> >  				       LOCK_DIE_ON_ERROR);
> >  		add_files_to_cache(the_repository, also ? prefix : NULL,
> > -				   &pathspec, NULL, 0, 0);
> > +				   &pathspec, ps_matched, 0, 0);
> > +		if (!all && report_path_error(ps_matched, &pathspec)) {
> > +			free(ps_matched);
> > +			exit(1);
> 
> No need to free(ps_matched) immediately before exiting.  There are
> other recources (like pathspec) we are holding and not clearing, and
> we do not want to bother cleaning them all.

Understood.

> As we have another "if failed, die()" immediately after this hunk,
> adding another exit() would be OK.  Shouldn't we be exiting with 128
> to match what die() does, though?

I tried to match the exit code with the existing invocations of the same
when doing partial commit and reporting path errors. In
builtin/commit.c:

511	if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
512		exit(1);

list_paths() returns the return value of report_path_error().

> Other than that, looking good.

Thanks.