gitweb: Remove unused $hash_base parameter from normalize_link_target
...since it was decided for normalize_link_target to only mangle pathname, and do not try to check if target is present in $hash_base tree, for performance reasons. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
095e914281
commit
15c54fe7aa
@ -3339,10 +3339,7 @@ sub git_get_link_target {
|
|||||||
# return target of link relative to top directory (top tree);
|
# return target of link relative to top directory (top tree);
|
||||||
# return undef if it is not possible (including absolute links).
|
# return undef if it is not possible (including absolute links).
|
||||||
sub normalize_link_target {
|
sub normalize_link_target {
|
||||||
my ($link_target, $basedir, $hash_base) = @_;
|
my ($link_target, $basedir) = @_;
|
||||||
|
|
||||||
# we can normalize symlink target only if $hash_base is provided
|
|
||||||
return unless $hash_base;
|
|
||||||
|
|
||||||
# absolute symlinks (beginning with '/') cannot be normalized
|
# absolute symlinks (beginning with '/') cannot be normalized
|
||||||
return if (substr($link_target, 0, 1) eq '/');
|
return if (substr($link_target, 0, 1) eq '/');
|
||||||
@ -3398,7 +3395,7 @@ sub git_print_tree_entry {
|
|||||||
if (S_ISLNK(oct $t->{'mode'})) {
|
if (S_ISLNK(oct $t->{'mode'})) {
|
||||||
my $link_target = git_get_link_target($t->{'hash'});
|
my $link_target = git_get_link_target($t->{'hash'});
|
||||||
if ($link_target) {
|
if ($link_target) {
|
||||||
my $norm_target = normalize_link_target($link_target, $basedir, $hash_base);
|
my $norm_target = normalize_link_target($link_target, $basedir);
|
||||||
if (defined $norm_target) {
|
if (defined $norm_target) {
|
||||||
print " -> " .
|
print " -> " .
|
||||||
$cgi->a({-href => href(action=>"object", hash_base=>$hash_base,
|
$cgi->a({-href => href(action=>"object", hash_base=>$hash_base,
|
||||||
|
Loading…
Reference in New Issue
Block a user