mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.8.1.5

Browse Source
This commit is contained in:
Junio C Hamano
2013-03-01 13:17:18 -08:00
parent 443d803e0d e6363a4992
commit 06d67b8766
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/RelNotes/1.8.1.5.txt
View File

@ -8,6 +8,12 @@ Fixes since v1.8.1.4
the command line where an option is expected, the option parser the command line where an option is expected, the option parser
used just one byte of the unknown letter when reporting an error. used just one byte of the unknown letter when reporting an error.
* In v1.8.1, the attribute parser was tightened too restrictive to
error out upon seeing an entry that begins with an ! (exclamation),
which may confuse users to expect a "negative match", which does
not exist. This has been demoted to a warning; such an entry is
still ignored.
* "git apply --summary" has been taught to make sure the similarity * "git apply --summary" has been taught to make sure the similarity
value shown in its output is sensible, even when the input had a value shown in its output is sensible, even when the input had a
bogus value. bogus value.

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.8.1.4/git.html[documentation for release 1.8.1.4] * link:v1.8.1.5/git.html[documentation for release 1.8.1.5]
* release notes for * release notes for
link:RelNotes/1.8.1.5.txt[1.8.1.5],
link:RelNotes/1.8.1.4.txt[1.8.1.4], link:RelNotes/1.8.1.4.txt[1.8.1.4],
link:RelNotes/1.8.1.3.txt[1.8.1.3], link:RelNotes/1.8.1.3.txt[1.8.1.3],
link:RelNotes/1.8.1.2.txt[1.8.1.2], link:RelNotes/1.8.1.2.txt[1.8.1.2],

2
Documentation/githooks.txt
View File

@ -365,7 +365,7 @@ preceding SP is also omitted. Currently, no commands pass any
'extra-info'. 'extra-info'.
The hook always runs after the automatic note copying (see The hook always runs after the automatic note copying (see
"notes.rewrite.<command>" in linkgit:git-config.txt) has happened, and "notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and
thus has access to these notes. thus has access to these notes.
The following command-specific comments apply: The following command-specific comments apply:

8
attr.c
View File

@ -255,9 +255,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
&res->u.pat.patternlen, &res->u.pat.patternlen,
&res->u.pat.flags, &res->u.pat.flags,
&res->u.pat.nowildcardlen); &res->u.pat.nowildcardlen);
if (res->u.pat.flags & EXC_FLAG_NEGATIVE) if (res->u.pat.flags & EXC_FLAG_NEGATIVE) {
die(_("Negative patterns are forbidden in git attributes\n" warning(_("Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation.")); "Use '\\!' for literal leading exclamation."));
return NULL;
}
} }
res->is_macro = is_macro; res->is_macro = is_macro;
res->num_attr = num_attr; res->num_attr = num_attr;

3
t/t0003-attributes.sh
View File

@ -198,7 +198,8 @@ test_expect_success 'root subdir attribute test' '
test_expect_success 'negative patterns' ' test_expect_success 'negative patterns' '
echo "!f test=bar" >.gitattributes && echo "!f test=bar" >.gitattributes &&
test_must_fail git check-attr test -- f git check-attr test -- '"'"'!f'"'"' 2>errors &&
test_i18ngrep "Negative patterns are ignored" errors
' '
test_expect_success 'patterns starting with exclamation' ' test_expect_success 'patterns starting with exclamation' '