Merge branch 'uk/merge-subtree-doc-update' into maint

diff --git a/builtin/add.c b/builtin/add.c
index 9916498a29bbd8fa7c5c5d8e7bd32e1dc184909b..0b64bcdebe0f4581953adccf8addf1c3fd1eb61e 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -454,7 +454,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
         * Check the "pathspec '%s' did not match any files" block
         * below before enabling new magic.
         */
-       parse_pathspec(&pathspec, 0,
+       parse_pathspec(&pathspec, PATHSPEC_ATTR,
                       PATHSPEC_PREFER_FULL |
                       PATHSPEC_SYMLINK_LEADING_PATH,
                       prefix, argv);