Git 1.6.5.9

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

diff --cc Documentation/RelNotes/1.6.5.9.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bb469dd71e55318319acab1f3af23bdf658fc2da
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/1.6.5.9.txt
@@@ -1,0 -1,0 +1,18 @@@
++Git v1.6.5.9 Release Notes
++==========================
++
++Fixes since v1.6.5.8
++--------------------
++
++ * An overlong line after ".gitdir: " in a git file caused out of bounds
++   access to an array on the stack.
++
++ * "git blame -L $start,$end" segfaulted when too large $start was given.
++
++ * "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
++   when --keep-dashdash was in effect.
++
++ * "gitweb" can sometimes be tricked into parrotting a filename argument
++   given in a request without properly quoting.
++
++Other minor fixes and documentation updates are included.

diff --cc GIT-VERSION-GEN
index 52b058a5868e904f6384a922e7edd0ced5f70d89,d453662e5af42d6d67345f8da1f69c60b5a3a3ed..1d79f482961d30b91c2ba1ee9ad062e2545a0965
--- 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.6.5.8
 -DEF_VER=v1.6.4.5
++DEF_VER=v1.6.5.9
  
  LF='
  '

diff --cc RelNotes
index f60e868f4721b24cfe989303193bf0a9be3473a7,feba6e41245a74acbea47797b5c3f740e53a2cd2..3c23099a3734f8fb9de7c7894308334d5a5b4aec
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes-1.6.5.8.txt
 -Documentation/RelNotes/1.6.4.5.txt
++Documentation/RelNotes/1.6.5.9.txt

diff --cc gitweb/gitweb.perl
index c77cd0341d98f6a38af55c6ed6f09704abf4e967,c3a04b122352650e22f81f7ae5acdc3cdf100135..620b5bdbbe238a79f3d9d8fcf852c8d0f3609818
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -5064,8 -5042,7 +5071,9 @@@ sub git_blob 
                        chomp $line;
                        $nr++;
                        $line = untabify($line);
-                       printf "<div class=\"pre\"><a id=\"l%i\" href=\"" . href(-replay => 1)
 -                      printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
++                      printf "<div class=\"pre\"><a id=\"l%i\" href=\""
++                              . esc_attr(href(-replay => 1))
 +                              . "#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
                               $nr, $nr, $nr, esc_html($line, -nbsp=>1);
                }
        }