kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

GIT 1.5.6.6 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint v1.5.6.6
Junio C Hamano 2008-12-16 22:13:36 -08:00
parent 21926fe885 f23ffbe890
commit 438d2991ea
5 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/RelNotes-1.5.4.7.txt Normal file
View File

@ -0,0 +1,10 @@
GIT v1.5.4.7 Release Notes
==========================

Fixes since 1.5.4.7
-------------------

* 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.

10
Documentation/RelNotes-1.5.5.6.txt Normal file
View File

@ -0,0 +1,10 @@
GIT v1.5.5.6 Release Notes
==========================

Fixes since 1.5.5.5
-------------------

* 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.

10
Documentation/RelNotes-1.5.6.6.txt Normal file
View File

@ -0,0 +1,10 @@
GIT v1.5.6.6 Release Notes
==========================

Fixes since 1.5.6.5
-------------------

* 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.

2
RelNotes
View File

@ -1 +1 @@
Documentation/RelNotes-1.5.6.5.txt
Documentation/RelNotes-1.5.6.6.txt

38
gitweb/gitweb.perl
View File

@ -4926,43 +4926,9 @@ sub git_blobdiff {
or die_error(undef, "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(undef, "Open git-diff failed");
} else {
# 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")
unless %diffinfo;
}

# header