undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add: include magic part of pathspec on --refresh error

Browse Source 
When `git add --refresh <pathspec>` doesn't find any matches for the
given pathspec, it prints an error message using the `match` field of
the `struct pathspec_item`. However, this field doesn't contain the
magic part of the pathspec. Instead, let's use the `original` field.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matheus Tavares 2021-04-08 17:41:22 -03:00 committed by Junio C Hamano
parent a5828ae6b5
commit 4e95698349
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/add.c
View File

@ -187,7 +187,7 @@ static void refresh(int verbose, const struct pathspec *pathspec)
for (i = 0; i < pathspec->nr; i++) { for (i = 0; i < pathspec->nr; i++) {
if (!seen[i]) if (!seen[i])
die(_("pathspec '%s' did not match any files"), die(_("pathspec '%s' did not match any files"),
pathspec->items[i].match); pathspec->items[i].original);
} }
free(seen); free(seen);
} }

6
t/t3700-add.sh
View File

@ -196,6 +196,12 @@ test_expect_success 'git add --refresh with pathspec' '
grep baz actual grep baz actual
' '
test_expect_success 'git add --refresh correctly reports no match error' "
echo \"fatal: pathspec ':(icase)nonexistent' did not match any files\" >expect &&
test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
test_cmp expect actual
"
test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' ' test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
git reset --hard && git reset --hard &&
date >foo1 && date >foo1 &&