summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 15:33:26 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-27 15:33:26 -0800
commite22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c (patch)
tree44d2eb29376487ec18f0c7fde66595a78e76db61 /gitweb
parentbdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea (diff)
parentfd49e56af68fbdc19a4dc72ca1cf811a239df595 (diff)
downloadgit-e22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c.tar.gz
Merge branch 'jn/gitweb-unborn-head' into maint
* jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index c876e0fb4e..d5dbd6428b 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5568,7 +5568,7 @@ sub git_tags_body {
sub git_heads_body {
# uses global variable $project
- my ($headlist, $head, $from, $to, $extra) = @_;
+ my ($headlist, $head_at, $from, $to, $extra) = @_;
$from = 0 unless defined $from;
$to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);
@@ -5577,7 +5577,7 @@ sub git_heads_body {
for (my $i = $from; $i <= $to; $i++) {
my $entry = $headlist->[$i];
my %ref = %$entry;
- my $curr = $ref{'id'} eq $head;
+ my $curr = defined $head_at && $ref{'id'} eq $head_at;
if ($alternate) {
print "<tr class=\"dark\">\n";
} else {