Sync with 1.7.0.2

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

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].
 

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='
 '

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" \