summaryrefslogtreecommitdiff
path: root/builtin/add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-24 17:30:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-24 17:30:51 (GMT)
commitfaadedb19538a9968dd2d607bcab00be1916bd31 (patch)
tree8636f755fa6b929248d66075040e6b98a51e047b /builtin/add.c
parent5b39d49515bc07bc36bda8bc330b41bf06d5042e (diff)
parent84d938b732242e81ec68647994070eb7c34d061f (diff)
downloadgit-faadedb19538a9968dd2d607bcab00be1916bd31.zip
git-faadedb19538a9968dd2d607bcab00be1916bd31.tar.gz
git-faadedb19538a9968dd2d607bcab00be1916bd31.tar.bz2
Merge branch 'nd/attr-pathspec-fix'
"git add ':(attr:foo)'" is not supported and is supposed to be rejected while the command line arguments are parsed, but we fail to reject such a command line upfront. * nd/attr-pathspec-fix: add: do not accept pathspec magic 'attr'
Diffstat (limited to 'builtin/add.c')
-rw-r--r--builtin/add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 9916498..0b64bcd 100644
--- 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);