Git 1.7.1.4

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

diff --cc Documentation/RelNotes/1.7.1.4.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7c734b4f7b0eb291204bedf2a6883eeddf6ae297
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/1.7.1.4.txt
@@@ -1,0 -1,0 +1,8 @@@
++Git v1.7.1.4 Release Notes
++==========================
++
++Fixes since v1.7.1.3
++--------------------
++
++ * "gitweb" can sometimes be tricked into parrotting a filename argument
++   given in a request without properly quoting.

diff --cc GIT-VERSION-GEN
index 8eb10c2c1fd974cb8bc2cd9540ca42e24eed0874,c07c5959bb25ef72bbf17f6d0ac13685568236d7..5e8077ebf47ebf749adbc63ee550028fb74d5378
--- 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.1.3
 -DEF_VER=v1.7.0.9
++DEF_VER=v1.7.1.4
  
  LF='
  '

diff --cc RelNotes
index d3921d81b8d765147c373118e6775faacb9ab25e,2e4322a073d72f242a56bc2e00c9aa84ff73806c..86af99bd3774d6e35785c12725e1134da023a223
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/1.7.1.3.txt
 -Documentation/RelNotes/1.7.0.9.txt
++Documentation/RelNotes/1.7.1.4.txt

diff --cc gitweb/gitweb.perl
Simple merge