Merge branch 'maint'

* maint:
Git 1.7.0.1
Remove reference to GREP_COLORS from documentation
sha1_name: fix segfault caused by invalid index access

diff --combined Documentation/config.txt
index 664de6b1ab1fa187ff510eda414c46b5213a8397,2dc3a0583bde6f5822c88d55e7d0b21670bb7693..7103172ed30c33f2c7933f530d03ce98c1e4f360
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -138,11 -138,6 +138,11 @@@ advice.*:
                Advice on how to set your identity configuration when
                your information is guessed from the system username and
                domain name. Default: true.
 +
 +      detachedHead::
 +              Advice shown when you used linkgit::git-checkout[1] to
 +              move to the detach HEAD state, to instruct how to create
 +              a local branch after the fact.  Default: true.
  --
  
  core.fileMode::
@@@ -685,9 -680,7 +685,7 @@@ color.grep:
  
  color.grep.match::
        Use customized color for matches.  The value of this variable
-       may be specified as in color.branch.<slot>.  It is passed using
-       the environment variables 'GREP_COLOR' and 'GREP_COLORS' when
-       calling an external 'grep'.
+       may be specified as in color.branch.<slot>.
  
  color.interactive::
        When set to `always`, always use colors for interactive prompts