summaryrefslogtreecommitdiff
path: root/builtin-check-attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-15 14:56:09 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-15 15:49:41 -0700
commite4aee10a2eaf0937d86d046f85ee569a75cae9ac (patch)
tree23300fe84d1e3f9c2c6f0d873c103bb09fc491ed /builtin-check-attr.c
parentfc2d07b05fb691f98b3a55c1499fae6fb25a7d31 (diff)
downloadgit-e4aee10a2eaf0937d86d046f85ee569a75cae9ac.tar.gz
Change attribute negation marker from '!' to '-'.
At the same time, we do not want to allow arbitrary strings for attribute names, as we are likely to want to extend the syntax later. Allow only alnum, dash, underscore and dot for now. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-check-attr.c')
-rw-r--r--builtin-check-attr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin-check-attr.c b/builtin-check-attr.c
index 47b07210d6..634be9ed2e 100644
--- a/builtin-check-attr.c
+++ b/builtin-check-attr.c
@@ -29,8 +29,12 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
check = xcalloc(cnt, sizeof(*check));
for (i = 0; i < cnt; i++) {
const char *name;
+ struct git_attr *a;
name = argv[i + 1];
- check[i].attr = git_attr(name, strlen(name));
+ a = git_attr(name, strlen(name));
+ if (!a)
+ return error("%s: not a valid attribute name", name);
+ check[i].attr = a;
}
for (i = doubledash; i < argc; i++) {