From 5565f47c4054e9a1abfad8c4a754e9a6224dc591 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Wed, 18 Nov 2009 17:15:19 +0100 Subject: unset GREP_OPTIONS in test-lib.sh I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this the test t4252-am-options.sh fails because it calls grep with a .rej file: grep "@@ -1,3 +1,3 @@" file-2.rej Signed-off-by: Bert Wesarg Signed-off-by: Junio C Hamano --- t/test-lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index afd3053f96..a0e396a952 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -65,6 +65,8 @@ GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u} # CDPATH into the environment unset CDPATH +unset GREP_OPTIONS + case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in 1|2|true) echo "* warning: Some tests will not work if GIT_TRACE" \ -- cgit v1.2.3 From 97222d9634b5518cd3d328aa86b52746a16334a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Mar 2010 11:07:51 -0800 Subject: Git 1.7.0.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.0.2.txt | 6 ------ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/RelNotes-1.7.0.2.txt b/Documentation/RelNotes-1.7.0.2.txt index e44e010c11..fcb46ca6a4 100644 --- a/Documentation/RelNotes-1.7.0.2.txt +++ b/Documentation/RelNotes-1.7.0.2.txt @@ -38,9 +38,3 @@ Fixes since v1.7.0.1 file. And other minor fixes and documentation updates. - ---- -exec >/var/tmp/1 -O=v1.7.0.1-64-g7d18122 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint diff --git a/Documentation/git.txt b/Documentation/git.txt index 98b6e16982..35c0c7983d 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.7.0.1/git.html[documentation for release 1.7.0.1] +* link:v1.7.0.2/git.html[documentation for release 1.7.0.2] * release notes for + link:RelNotes-1.7.0.2.txt[1.7.0.2], link:RelNotes-1.7.0.1.txt[1.7.0.1], link:RelNotes-1.7.0.txt[1.7.0]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7f894fdd46..d968ff0fcd 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.0.1 +DEF_VER=v1.7.0.2 LF=' ' -- cgit v1.2.3