From: Junio C Hamano Date: Wed, 15 Dec 2010 19:27:41 +0000 (-0800) Subject: Git 1.6.5.9 X-Git-Tag: v1.6.5.9^0 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec82874ad47627a44b6b22a6645551a214293711;p=git.git Git 1.6.5.9 Signed-off-by: Junio C Hamano --- ec82874ad47627a44b6b22a6645551a214293711 diff --cc Documentation/RelNotes/1.6.5.9.txt index 000000000,000000000..bb469dd71 new file mode 100644 --- /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 52b058a58,d453662e5..1d79f4829 --- a/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 f60e868f4,feba6e412..3c23099a3 --- a/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 c77cd0341,c3a04b122..620b5bdbb --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@@ -5064,8 -5042,7 +5071,9 @@@ sub git_blob chomp $line; $nr++; $line = untabify($line); - printf "

%4i %s

\n", ++ printf "

1)) + . "#l%i\" class=\"linenr\">%4i %s

\n", $nr, $nr, $nr, esc_html($line, -nbsp=>1); } }