development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

builtin/add: error out when passing untracked path with -u

Browse source 
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.

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ghanshyam Thakkar 2024-04-03 23:44:52 +05:30 committed by Junio C Hamano
parent ac5946e624
commit 7de13cfef3
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builtin/add.c
View file

@ -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);
@ -549,13 +550,18 @@ int cmd_add(int argc, const char **argv, const char *prefix)
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 && !add_renormalize && !ignore_add_errors &&
report_path_error(ps_matched, &pathspec))
exit(128);
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;

10
t/t2200-add-update.sh
View file

@ -65,6 +65,16 @@ test_expect_success 'update did not touch untracked files' '
test_must_be_empty out
'
test_expect_success 'error out when passing untracked path' '
git reset --hard &&
echo content >>baz &&
echo content >>top &&
test_must_fail git add -u baz top 2>err &&
test_grep -e "error: pathspec .baz. did not match any file(s) known to git" err &&
git diff --cached --name-only >actual &&
test_must_be_empty actual
'
test_expect_success 'cache tree has not been corrupted' '
git ls-files -s |