From: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Subject: [PATCH v2 3/3] builtin/add: error out when passing untracked path with -u
Date: Sat, 30 Mar 2024 02:26:21 +0530 [thread overview]
Message-ID: <20240329205649.1483032-5-shyamthakkar001@gmail.com> (raw)
In-Reply-To: <20240318155219.494206-2-shyamthakkar001@gmail.com>
When passing untracked path with -u option, it silently succeeds. There
is no error message and the exit code is zero. This is inconsistent
with other instances of git commands where the expected argument is a
known path. In those other instances, we error out when the path is
not known.
Therefore, fix this by passing a character array to
add_files_to_cache() to collect the pathspec matching information and
report the error if a pathspec does not match any cache entry. Also add
a testcase to cover this scenario.
Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
---
builtin/add.c | 9 ++++++++-
t/t2200-add-update.sh | 6 ++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/builtin/add.c b/builtin/add.c
index ffe5fd8d44..650432bb13 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -370,6 +370,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int add_new_files;
int require_pathspec;
char *seen = NULL;
+ char *ps_matched = NULL;
struct lock_file lock_file = LOCK_INIT;
git_config(add_config, NULL);
@@ -547,15 +548,20 @@ int cmd_add(int argc, const char **argv, const char *prefix)
string_list_clear(&only_match_skip_worktree, 0);
}
+
begin_odb_transaction();
+ ps_matched = xcalloc(pathspec.nr, 1);
if (add_renormalize)
exit_status |= renormalize_tracked_files(&pathspec, flags);
else
exit_status |= add_files_to_cache(the_repository, prefix,
- &pathspec, NULL,
+ &pathspec, ps_matched,
include_sparse, flags);
+ if (take_worktree_changes)
+ exit_status |= report_path_error(ps_matched, &pathspec);
+
if (add_new_files)
exit_status |= add_files(&dir, flags);
@@ -568,6 +574,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write new index file"));
+ free(ps_matched);
dir_clear(&dir);
clear_pathspec(&pathspec);
return exit_status;
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index c01492f33f..7cba325f08 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -65,6 +65,12 @@ test_expect_success 'update did not touch untracked files' '
test_must_be_empty out
'
+test_expect_success 'error out when passing untracked path' '
+ echo content >baz &&
+ test_must_fail git add -u baz 2>err &&
+ test_grep -e "error: pathspec .baz. did not match any file(s) known to git" err
+'
+
test_expect_success 'cache tree has not been corrupted' '
git ls-files -s |
--
2.44.0
next prev parent reply other threads:[~2024-03-29 21:02 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
2024-03-29 20:56 ` Ghanshyam Thakkar [this message]
2024-03-29 21:43 ` [PATCH v2 3/3] builtin/add: error out when passing untracked path with -u 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240329205649.1483032-5-shyamthakkar001@gmail.com \
--to=shyamthakkar001@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).