GIT 1.6.0.6

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

diff --cc Documentation/RelNotes-1.6.0.6.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..64ece1ffd5cb36430da30437a1bd1e167611662c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes-1.6.0.6.txt
@@@ -1,0 -1,0 +1,33 @@@
++GIT v1.6.0.6 Release Notes
++==========================
++
++Fixes since 1.6.0.5
++-------------------
++
++ * "git fsck" had a deep recursion that wasted stack space.
++
++ * "git fast-export" and "git fast-import" choked on an old style
++   annotated tag that lack the tagger information.
++
++ * "git mergetool -- file" did not correctly skip "--" marker that
++   signals the end of options list.
++
++ * "git show $tag" segfaulted when an annotated $tag pointed at a
++   nonexistent object.
++
++ * "git show 2>error" when the standard output is automatically redirected
++   to the pager redirected the standard error to the pager as well; there
++   was no need to.
++
++ * "git send-email" did not correctly handle list of addresses when
++   they had quoted comma (e.g. "Lastname, Givenname" <mail@addre.ss>).
++
++ * Logic to discover branch ancestry in "git svn" was unreliable when
++   the process to fetch history was interrupted.
++
++ * Removed support for an obsolete gitweb request URI, whose
++   implementation ran "git diff" Porcelain, instead of using plumbing,
++   which would have run an external diff command specified in the
++   repository configuration as the gitweb user.
++
++Also contains numerous documentation typofixes.

diff --cc RelNotes
index ebf508f2d7ccb5b3c32dd298dfbfcd243a006947,6ca1d5b43948525e43c3c354dd424ab054772a95..009d8f0e27fec18b98d11d1fed6dab81cfd1d6f4
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes-1.6.0.5.txt
 -Documentation/RelNotes-1.5.6.6.txt
++Documentation/RelNotes-1.6.0.6.txt

diff --cc gitweb/gitweb.perl
index ced7bb740f45858671d6b9fdb83fd13f15d18c1d,f88ce35ce8542e271a737335a116684429de2127..804670c2c6288f586c3e1860d2a87995b822b91f
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -4860,46 -4923,12 +4860,12 @@@ sub git_blobdiff 
                        '-p', ($format eq 'html' ? "--full-index" : ()),
                        $hash_parent_base, $hash_base,
                        "--", (defined $file_parent ? $file_parent : ()), $file_name
 -                      or die_error(undef, "Open git-diff-tree failed");
 +                      or die_error(500, "Open git-diff-tree failed");
        }
  
-       # old/legacy style URI
-       if (!%diffinfo && # if new style URI failed
-           defined $hash && defined $hash_parent) {
-               # fake git-diff-tree raw output
-               $diffinfo{'from_mode'} = $diffinfo{'to_mode'} = "blob";
-               $diffinfo{'from_id'} = $hash_parent;
-               $diffinfo{'to_id'}   = $hash;
-               if (defined $file_name) {
-                       if (defined $file_parent) {
-                               $diffinfo{'status'} = '2';
-                               $diffinfo{'from_file'} = $file_parent;
-                               $diffinfo{'to_file'}   = $file_name;
-                       } else { # assume not renamed
-                               $diffinfo{'status'} = '1';
-                               $diffinfo{'from_file'} = $file_name;
-                               $diffinfo{'to_file'}   = $file_name;
-                       }
-               } else { # no filename given
-                       $diffinfo{'status'} = '2';
-                       $diffinfo{'from_file'} = $hash_parent;
-                       $diffinfo{'to_file'}   = $hash;
-               }
- 
-               # non-textual hash id's can be cached
-               if ($hash =~ m/^[0-9a-fA-F]{40}$/ &&
-                   $hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
-                       $expires = '+1d';
-               }
- 
-               # open patch output
-               open $fd, "-|", git_cmd(), "diff", @diff_opts,
-                       '-p', ($format eq 'html' ? "--full-index" : ()),
-                       $hash_parent, $hash, "--"
-                       or die_error(500, "Open git-diff failed");
-       } else  {
-               die_error(400, "Missing one of the blob diff parameters")
-                       unless %diffinfo;
+       # old/legacy style URI -- not generated anymore since 1.4.3.
+       if (!%diffinfo) {
+               die_error('404 Not Found', "Missing one of the blob diff parameters")
        }
  
        # header