From: Junio C Hamano <gitster@pobox.com>
To: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 2/3] builtin/commit: error out when passing untracked path with -i
Date: Fri, 29 Mar 2024 14:38:24 -0700 [thread overview]
Message-ID: <xmqqcyrcwwfj.fsf@gitster.g> (raw)
In-Reply-To: <20240329205649.1483032-4-shyamthakkar001@gmail.com> (Ghanshyam Thakkar's message of "Sat, 30 Mar 2024 02:26:20 +0530")
Ghanshyam Thakkar <shyamthakkar001@gmail.com> writes:
> When we provide a pathspec which does not match any tracked path
> alongside --include, we do not error like without --include. If there
> is something staged, it will commit the staged changes and ignore the
> pathspec which does not match any tracked path. And if nothing is
> staged, it will print the status. Exit code is 0 in both cases (unlike
> without --include). This is also described in the TODO comment before
> the relevant testcase.
>
> Fix this by passing a character array to add_files_to_cache() to
> collect the pathspec matching information and error out if the given
> path is untracked. Also, amend the testcase to check for the error
> message and remove the TODO comment.
>
> Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
> ---
> builtin/commit.c | 9 ++++++++-
> t/t7501-commit-basic-functionality.sh | 16 +---------------
> 2 files changed, 9 insertions(+), 16 deletions(-)
Nice.
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 24efeaca98..355f25ec2a 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);
> + }
> + free(ps_matched);
> +
Looking simple and very nice.
This change would not have to be redone even if we decide not to add
a new parameter to run_diff_files() and instead add a new member to
the revs structure instead, because it all happens at the level or
below add_files_to_cache().
next prev parent reply other threads:[~2024-03-29 21:38 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 15:51 [PATCH 0/2] fix certain cases of add and commit with untracked path not erroring out Ghanshyam Thakkar
2024-03-18 15:51 ` [PATCH 1/2] builtin/commit: error out when passing untracked path with -i Ghanshyam Thakkar
2024-03-18 17:27 ` Junio C Hamano
2024-03-18 15:52 ` [PATCH 2/2] builtin/add: error out when passing untracked path with -u Ghanshyam Thakkar
2024-03-18 17:31 ` Junio C Hamano
2024-03-29 20:56 ` [PATCH v2 0/3] commit, add: error out when passing untracked path Ghanshyam Thakkar
2024-04-02 21:36 ` [PATCH v3 0/3] commit, add: error out when passing untracked paths Ghanshyam Thakkar
2024-04-03 18:14 ` [PATCH v4 0/3] commit,add: error out when passing untracked path Ghanshyam Thakkar
2024-04-03 18:14 ` [PATCH v4 1/3] revision: optionally record matches with pathspec elements Ghanshyam Thakkar
2024-04-03 18:14 ` [PATCH v4 2/3] builtin/commit: error out when passing untracked path with -i Ghanshyam Thakkar
2024-04-03 18:14 ` [PATCH v4 3/3] builtin/add: error out when passing untracked path with -u Ghanshyam Thakkar
2024-04-02 21:36 ` [PATCH v3 1/3] revision: optionally record matches with pathspec elements Ghanshyam Thakkar
2024-04-02 21:36 ` [PATCH v3 2/3] builtin/commit: error out when passing untracked path with -i Ghanshyam Thakkar
2024-04-02 21:47 ` Junio C Hamano
2024-04-02 21:58 ` Ghanshyam Thakkar
2024-04-02 21:36 ` [PATCH v3 3/3] builtin/add: error out when passing untracked path with -u Ghanshyam Thakkar
2024-04-02 21:49 ` Junio C Hamano
2024-04-02 22:00 ` Ghanshyam Thakkar
2024-03-29 20:56 ` [PATCH v2 1/3] read-cache: optionally collect pathspec matching info Ghanshyam Thakkar
2024-03-29 21:35 ` Junio C Hamano
2024-03-29 22:16 ` Junio C Hamano
2024-03-30 14:27 ` Ghanshyam Thakkar
2024-03-30 16:27 ` Junio C Hamano
2024-03-29 20:56 ` [PATCH v2 2/3] builtin/commit: error out when passing untracked path with -i Ghanshyam Thakkar
2024-03-29 21:38 ` Junio C Hamano [this message]
2024-03-29 20:56 ` [PATCH v2 3/3] builtin/add: error out when passing untracked path with -u Ghanshyam Thakkar
2024-03-29 21:43 ` Junio C Hamano
2024-03-30 14:18 ` Ghanshyam Thakkar
2024-03-30 16:49 ` Junio C Hamano
2024-04-01 13:27 ` Ghanshyam Thakkar
2024-04-01 16:31 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqcyrcwwfj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=shyamthakkar001@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).