зеркало из https://github.com/microsoft/git.git
add: don't complain when adding empty project root
We try to warn the user if one of their pathspecs caused no matches, as it may have been a typo. However, we disable the warning if the pathspec points to an existing file, since that means it is not a typo but simply an empty directory. Unfortunately, the file_exists() test was broken for one special case: the pathspec of the project root is just "". This patch detects this special case and acts as if the file exists (which it must, since it is the project root). The user-visible effect is that this: $ mkdir repo && cd repo && git init && git add . used to complain like: fatal: pathspec '' did not match any files but now is a silent no-op. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ec00d6e003
Коммит
07d7bedda8
|
@ -61,7 +61,7 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
|
||||||
fill_pathspec_matches(pathspec, seen, specs);
|
fill_pathspec_matches(pathspec, seen, specs);
|
||||||
|
|
||||||
for (i = 0; i < specs; i++) {
|
for (i = 0; i < specs; i++) {
|
||||||
if (!seen[i] && !file_exists(pathspec[i]))
|
if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
|
||||||
die("pathspec '%s' did not match any files",
|
die("pathspec '%s' did not match any files",
|
||||||
pathspec[i]);
|
pathspec[i]);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче