Skip to content

Commit 718258e

Browse files
gitstergitster
committed
GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parents 88fbf67 + 438d299 commit 718258e

File tree

6 files changed

+67
-38
lines changed

6 files changed

+67
-38
lines changed

‎Documentation/RelNotes-1.5.4.7.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
GIT v1.5.4.7 Release Notes
2+
==========================
3+
4+
Fixes since 1.5.4.7
5+
-------------------
6+
7+
* Removed support for an obsolete gitweb request URI, whose
8+
implementation ran "git diff" Porcelain, instead of using plumbing,
9+
which would have run an external diff command specified in the
10+
repository configuration as the gitweb user.

‎Documentation/RelNotes-1.5.5.6.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
GIT v1.5.5.6 Release Notes
2+
==========================
3+
4+
Fixes since 1.5.5.5
5+
-------------------
6+
7+
* Removed support for an obsolete gitweb request URI, whose
8+
implementation ran "git diff" Porcelain, instead of using plumbing,
9+
which would have run an external diff command specified in the
10+
repository configuration as the gitweb user.

‎Documentation/RelNotes-1.5.6.6.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
GIT v1.5.6.6 Release Notes
2+
==========================
3+
4+
Fixes since 1.5.6.5
5+
-------------------
6+
7+
* Removed support for an obsolete gitweb request URI, whose
8+
implementation ran "git diff" Porcelain, instead of using plumbing,
9+
which would have run an external diff command specified in the
10+
repository configuration as the gitweb user.

‎Documentation/RelNotes-1.6.0.6.txt‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
GIT v1.6.0.6 Release Notes
2+
==========================
3+
4+
Fixes since 1.6.0.5
5+
-------------------
6+
7+
* "git fsck" had a deep recursion that wasted stack space.
8+
9+
* "git fast-export" and "git fast-import" choked on an old style
10+
annotated tag that lack the tagger information.
11+
12+
* "git mergetool -- file" did not correctly skip "--" marker that
13+
signals the end of options list.
14+
15+
* "git show $tag" segfaulted when an annotated $tag pointed at a
16+
nonexistent object.
17+
18+
* "git show 2>error" when the standard output is automatically redirected
19+
to the pager redirected the standard error to the pager as well; there
20+
was no need to.
21+
22+
* "git send-email" did not correctly handle list of addresses when
23+
they had quoted comma (e.g. "Lastname, Givenname" <mail@addre.ss>).
24+
25+
* Logic to discover branch ancestry in "git svn" was unreliable when
26+
the process to fetch history was interrupted.
27+
28+
* Removed support for an obsolete gitweb request URI, whose
29+
implementation ran "git diff" Porcelain, instead of using plumbing,
30+
which would have run an external diff command specified in the
31+
repository configuration as the gitweb user.
32+
33+
Also contains numerous documentation typofixes.

‎RelNotes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes-1.6.0.5.txt
1+
Documentation/RelNotes-1.6.0.6.txt

‎gitweb/gitweb.perl‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4863,43 +4863,9 @@ sub git_blobdiff {
48634863
or die_error(500, "Open git-diff-tree failed");
48644864
}
48654865

4866-
# old/legacy style URI
4867-
if (!%diffinfo && # if new style URI failed
4868-
defined $hash && defined $hash_parent) {
4869-
# fake git-diff-tree raw output
4870-
$diffinfo{'from_mode'} = $diffinfo{'to_mode'} = "blob";
4871-
$diffinfo{'from_id'} = $hash_parent;
4872-
$diffinfo{'to_id'} = $hash;
4873-
if (defined $file_name) {
4874-
if (defined $file_parent) {
4875-
$diffinfo{'status'} = '2';
4876-
$diffinfo{'from_file'} = $file_parent;
4877-
$diffinfo{'to_file'} = $file_name;
4878-
} else { # assume not renamed
4879-
$diffinfo{'status'} = '1';
4880-
$diffinfo{'from_file'} = $file_name;
4881-
$diffinfo{'to_file'} = $file_name;
4882-
}
4883-
} else { # no filename given
4884-
$diffinfo{'status'} = '2';
4885-
$diffinfo{'from_file'} = $hash_parent;
4886-
$diffinfo{'to_file'} = $hash;
4887-
}
4888-
4889-
# non-textual hash id's can be cached
4890-
if ($hash =~ m/^[0-9a-fA-F]{40}$/ &&
4891-
$hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
4892-
$expires = '+1d';
4893-
}
4894-
4895-
# open patch output
4896-
open $fd, "-|", git_cmd(), "diff", @diff_opts,
4897-
'-p', ($format eq 'html' ? "--full-index" : ()),
4898-
$hash_parent, $hash, "--"
4899-
or die_error(500, "Open git-diff failed");
4900-
} else {
4901-
die_error(400, "Missing one of the blob diff parameters")
4902-
unless %diffinfo;
4866+
# old/legacy style URI -- not generated anymore since 1.4.3.
4867+
if (!%diffinfo) {
4868+
die_error('404 Not Found', "Missing one of the blob diff parameters")
49034869
}
49044870

49054871
# header

0 commit comments

Comments
 (0)