diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-28 03:33:26 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-28 03:33:26 +0400 |
commit | e22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c (patch) | |
tree | 44d2eb29376487ec18f0c7fde66595a78e76db61 /gitweb/gitweb.perl | |
parent | bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea (diff) | |
parent | fd49e56af68fbdc19a4dc72ca1cf811a239df595 (diff) |
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/gitweb.perl')
-rwxr-xr-x | gitweb/gitweb.perl | 4 |
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 { |