Git 1.6.6.3

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

diff --cc Documentation/RelNotes/1.6.6.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..11483acaec5528f828b0d630147187af0c151ed2
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/1.6.6.3.txt
@@@ -1,0 -1,0 +1,23 @@@
++Git v1.6.6.3 Release Notes
++==========================
++
++Fixes since v1.6.6.2
++--------------------
++
++ * An overlong line after ".gitdir: " in a git file caused out of bounds
++   access to an array on the stack.
++
++ * "git bisect $path" did not correctly diagnose an error when given a
++   non-existent path.
++
++ * "git blame -L $start,$end" segfaulted when too large $start was given.
++
++ * "git imap-send" did not write draft box with CRLF line endings per RFC.
++
++ * "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 081be51a9e64f3eb788cd31c2a3bc8ad454d2029,1d79f482961d30b91c2ba1ee9ad062e2545a0965..7d16b013824cc6974fe49e9a49c588146b6d7e2d
--- 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.6.2
 -DEF_VER=v1.6.5.9
++DEF_VER=v1.6.6.3
  
  LF='
  '

diff --cc RelNotes
index 692968f1702044f0474228f2c19f6086568ec9e4,3c23099a3734f8fb9de7c7894308334d5a5b4aec..3dad2389f600053e534a75563049a66b5bdb1ebf
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes-1.6.6.2.txt
 -Documentation/RelNotes/1.6.5.9.txt
++Documentation/RelNotes/1.6.6.3.txt

diff --cc gitweb/gitweb.perl
index 7e477af9567cff322d18fc9a1fbfe507732418dc,620b5bdbbe238a79f3d9d8fcf852c8d0f3609818..0fe8539321e6eb527aef127a17e437edb4998308
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -3327,18 -3228,6 +3334,18 @@@ sub git_footer_html 
                insert_file($site_footer);
        }
  
-       print qq!<script type="text/javascript" src="$javascript"></script>\n!;
++      print qq!<script type="text/javascript" src="!.esc_url($javascript).qq!"></script>\n!;
 +      if ($action eq 'blame_incremental') {
 +              print qq!<script type="text/javascript">\n!.
 +                    qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!.
 +                    qq!           "!. href() .qq!");\n!.
 +                    qq!</script>\n!;
 +      } elsif (gitweb_check_feature('javascript-actions')) {
 +              print qq!<script type="text/javascript">\n!.
 +                    qq!window.onload = fixLinks;\n!.
 +                    qq!</script>\n!;
 +      }
 +
        print "</body>\n" .
              "</html>";
  }