Use fixed string instead of shortened SHA1 identifier of commit
as a name for "mext" link in commitdiff view.
While at it make sure that we don't mistake option for a second
commit.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
gitweb/gitweb.perl | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4241d5c..9c81214 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3289,17 +3289,14 @@ sub git_commitdiff {
hash=>$hash, hash_parent=>$hash_parent)},
"raw");
- if (defined $hash_parent) {
+ if (defined $hash_parent && $hash_parent !~ m/^-/) {
# commitdiff with two commits given
- my $hash_parent_short = $hash_parent;
- if ($hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
- $hash_parent_short = substr($hash_parent, 0, 7);
- }
+ # second "commit" is not in fact diff option
$formats_nav .=
- ' (from: ' .
+ ' (' .
$cgi->a({-href => href(action=>"commitdiff",
hash=>$hash_parent)},
- esc_html($hash_parent_short)) .
+ 'from') .
')';
} elsif (!$co{'parent'}) {
# --root commitdiff
@@ -3307,10 +3304,10 @@ sub git_commitdiff {
} elsif (scalar @{$co{'parents'}} == 1) {
# single parent commit
$formats_nav .=
- ' (parent: ' .
+ ' (' .
$cgi->a({-href => href(action=>"commitdiff",
hash=>$co{'parent'})},
- esc_html(substr($co{'parent'}, 0, 7))) .
+ 'parent') .
')';
} else {
# merge commit
@@ -3319,7 +3316,7 @@ sub git_commitdiff {
join(' ', map {
$cgi->a({-href => href(action=>"commitdiff",
hash=>$_)},
- esc_html(substr($_, 0, 7)));
+ 'parent');
} @{$co{'parents'}} ) .
')';
}
--
1.4.2.1
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html