summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-01 21:17:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-01 21:17:18 (GMT)
commit06d67b876642822828596b0b38cda2f61d438335 (patch)
tree67de0d436a69443bf288411323b0ed209a6cb000 /attr.c
parent443d803e0dacd0a1c6700503689f3cd95751aba1 (diff)
parente6363a4992637267ef212d7c709ede17d4122e0d (diff)
downloadgit-06d67b876642822828596b0b38cda2f61d438335.zip
git-06d67b876642822828596b0b38cda2f61d438335.tar.gz
git-06d67b876642822828596b0b38cda2f61d438335.tar.bz2
Sync with 1.8.1.5
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/attr.c b/attr.c
index 4657cc2..e2f9377 100644
--- a/attr.c
+++ b/attr.c
@@ -255,9 +255,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
&res->u.pat.patternlen,
&res->u.pat.flags,
&res->u.pat.nowildcardlen);
- if (res->u.pat.flags & EXC_FLAG_NEGATIVE)
- die(_("Negative patterns are forbidden in git attributes\n"
- "Use '\\!' for literal leading exclamation."));
+ if (res->u.pat.flags & EXC_FLAG_NEGATIVE) {
+ warning(_("Negative patterns are ignored in git attributes\n"
+ "Use '\\!' for literal leading exclamation."));
+ return NULL;
+ }
}
res->is_macro = is_macro;
res->num_attr = num_attr;