зеркало из https://github.com/microsoft/git.git
add: do not rely on dtype being NULL behavior
Commitc84de70
(excluded_1(): support exclude files in index - 2009-08-20) added support for excluded() where dtype can be NULL. It was designed specifically for index matching because there was no other way to extract dtype information from index. It did not support wildcard matching (for example, "a*/" pattern would fail to match). The code was probably misread when commit108da0d
(git add: Add the "--ignore-missing" option for the dry run - 2010-07-10) was made because DT_UNKNOWN happens to be zero (NULL) too. Do not pass DT_UNKNOWN/NULL to excluded(), instead pass a pointer to a variable that contains DT_UNKNOWN. The real dtype will be extracted from worktree by excluded(), as expected. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
60aa9cf8f3
Коммит
0188f6b3c1
|
@ -446,7 +446,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||
if (!seen[i] && pathspec[i][0]
|
||||
&& !file_exists(pathspec[i])) {
|
||||
if (ignore_missing) {
|
||||
if (excluded(&dir, pathspec[i], DT_UNKNOWN))
|
||||
int dtype = DT_UNKNOWN;
|
||||
if (excluded(&dir, pathspec[i], &dtype))
|
||||
dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
|
||||
} else
|
||||
die("pathspec '%s' did not match any files",
|
||||
|
|
Загрузка…
Ссылка в новой задаче