Git 1.7.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/RelNotes/1.7.3.4.txt
index c2a46a2e96b9b5c415282dfaca39092d06067c86,0000000000000000000000000000000000000000..e57f7c176db85e3bd40862fd091ecab835c601f5
mode 100644,000000..100644
--- 1/Documentation/RelNotes/1.7.3.4.txt
--- /dev/null
+++ b/Documentation/RelNotes/1.7.3.4.txt
@@@ -1,42 -1,0 +1,45 @@@
 +Git v1.7.3.4 Release Notes
 +==========================
 +
 +Fixes since v1.7.3.3
 +--------------------
 +
 + * Smart HTTP transport used to incorrectly retry redirected POST
 +   request with GET request.
 +
 + * "git apply" did not correctly handle patches that only change modes
 +   if told to apply while stripping leading paths with -p option.
 +
 + * "git apply" can deal with patches with timezone formatted with a
 +   colon between the hours and minutes part (e.g. "-08:00" instead of
 +   "-0800").
 +
 + * "git checkout" removed an untracked file "foo" from the working
 +   tree when switching to a branch that contains a tracked path
 +   "foo/bar".  Prevent this, just like the case where the conflicting
 +   path were "foo" (c752e7f..7980872d).
 +
 + * "git cherry-pick" or "git revert" refused to work when a path that
 +   would be modified by the operation was stat-dirty without a real
 +   difference in the contents of the file.
 +
 + * "git diff --check" reported an incorrect line number for added
 +   blank lines at the end of file.
 +
 + * "git imap-send" failed to build under NO_OPENSSL.
 +
 + * Setting log.decorate configuration variable to "0" or "1" to mean
 +   "false" or "true" did not work.
 +
 + * "git push" over dumb HTTP protocol did not work against WebDAV
 +   servers that did not terminate a collection name with a slash.
 +
 + * "git tag -v" did not work with GPG signatures in rfc1991 mode.
 +
 + * The post-receive-email sample hook was accidentally broken in 1.7.3.3
 +   update.
 +
++ * "gitweb" can sometimes be tricked into parrotting a filename argument
++   given in a request without properly quoting.
++
 +Other minor fixes and documentation updates are also included.

diff --cc GIT-VERSION-GEN
index 702306acd2c10d1cbe04c26bf3b89bafadb256f7,ec4c49a90daacc11072f8285e5879378156c22a8..d40b287e5a91b29d0807a84077d8f6a89e073159
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v1.7.3.3
 -DEF_VER=v1.7.2.5
++DEF_VER=v1.7.3.4
  
  LF='
  '

diff --cc gitweb/gitweb.perl
Simple merge