Merge branch 'maint-1.7.11' into maint

* maint-1.7.11:
  Almost 1.7.11.6
  gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
  rebase -i: use full onto sha1 in reflog
  sh-setup: protect from exported IFS
  receive-pack: do not leak output from auto-gc to standard output
  t/t5400: demonstrate breakage caused by informational message from prune
  setup: clarify error messages for file/revisions ambiguity
  send-email: improve RFC2047 quote parsing
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value

diff --cc builtin.h
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc git-rebase--interactive.sh
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc setup.c
index 9139beefc75c4fe92cf8c7dc54a9fae972995aca,7663a4cbb2e3d179c3a16d647733da7bf89a3e2d..3a1b2fd45580cad7ecd55efa755872efc81075ad
--- 1/setup.c
--- 2/setup.c
+++ b/setup.c
@@@ -77,9 -77,12 +77,9 @@@ static void NORETURN die_verify_filenam
                                         const char *arg,
                                         int diagnose_misspelt_rev)
  {
 -      unsigned char sha1[20];
 -      unsigned mode;
 -
        if (!diagnose_misspelt_rev)
                die("%s: no such path in the working tree.\n"
-                   "Use '-- <path>...' to specify paths that do not exist locally.",
+                   "Use 'git <command> -- <path>...' to specify paths that do not exist locally.",
                    arg);
        /*
         * Saying "'(icase)foo' does not exist in the index" when the