From 0e9b327227fb8f7c1e3a5bbaef19e25b4dfd6764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Sun, 7 Apr 2013 10:48:30 +0200 Subject: [PATCH 1/3] remote-helpers/test-bzr.sh: do not use "grep '\s'" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using grep "devel\s\+3:" to find at least one whitspace is not portable on all grep versions; not all grep versions understand "\s" as a "whitespace". Use a literal TAB followed by SPACE. The + as a qualifier for "one or more" is not a basic regular expression; use egrep instead of grep. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano --- contrib/remote-helpers/test-hg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5f81dfae6c..7bb81f2f8e 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helpers/test-hg.sh @@ -115,7 +115,7 @@ test_expect_success 'update bookmark' ' git push ) && - hg -R hgrepo bookmarks | grep "devel\s\+3:" + hg -R hgrepo bookmarks | egrep "devel[ ]+3:" ' test_done From 2137ce01f83d254e4917c107901a5a04f61e8c16 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Apr 2013 08:58:30 -0700 Subject: [PATCH 2/3] Git 1.8.1.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.1.6.txt | 5 +++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.8.1.6.txt b/Documentation/RelNotes/1.8.1.6.txt index d9de639080..c15cf2e805 100644 --- a/Documentation/RelNotes/1.8.1.6.txt +++ b/Documentation/RelNotes/1.8.1.6.txt @@ -4,6 +4,11 @@ Git 1.8.1.6 Release Notes Fixes since v1.8.1.5 -------------------- + * An earlier change to the attribute system introduced at v1.8.1.2 by + mistake stopped a pattern "dir" (without trailing slash) from + matching a directory "dir" (it only wanted to allow pattern "dir/" + to also match). + * The code to keep track of what directory names are known to Git on platforms with case insensitive filesystems can get confused upon a hash collision between these pathnames and looped forever. diff --git a/Documentation/git.txt b/Documentation/git.txt index 98a45addf5..91299174f1 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.1.5/git.html[documentation for release 1.8.1.5] +* link:v1.8.1.6/git.html[documentation for release 1.8.1.6] * release notes for + link:RelNotes/1.8.1.6.txt[1.8.1.6], 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.3.txt[1.8.1.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6f09e2ff8b..2908204894 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.1.5 +DEF_VER=v1.8.1.6 LF=' ' From 5bda18c186e455f8e65f976d3bf333ab1f4b5b53 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Apr 2013 15:27:23 -0700 Subject: [PATCH 3/3] Git 1.8.2.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.2.1.txt | 5 +++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index 1ded500fc3..1354ad03f5 100644 --- a/Documentation/RelNotes/1.8.2.1.txt +++ b/Documentation/RelNotes/1.8.2.1.txt @@ -4,6 +4,11 @@ Git v1.8.2.1 Release Notes Fixes since v1.8.2 ------------------ + * An earlier change to the attribute system introduced at v1.8.1.2 by + mistake stopped a pattern "dir" (without trailing slash) from + matching a directory "dir" (it only wanted to allow pattern "dir/" + to also match). + * Verification of signed tags were not done correctly when not in C or en/US locale. diff --git a/Documentation/git.txt b/Documentation/git.txt index 5a6178820d..6a875f2ade 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.2/git.html[documentation for release 1.8.2] +* link:v1.8.2.1/git.html[documentation for release 1.8.2.1] * release notes for + link:RelNotes/1.8.2.1.txt[1.8.2.1]. link:RelNotes/1.8.2.txt[1.8.2]. * link:v1.8.1.6/git.html[documentation for release 1.8.1.6] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f189b7889e..26422bfc22 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.2 +DEF_VER=v1.8.2.1 LF=' '