mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jn/gitweb-unborn-head' into maint
* jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
This commit is contained in:
commit
e22c522730
|
@ -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 {
|
||||
|
|
|
@ -770,4 +770,13 @@ test_expect_success \
|
|||
'echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
|
||||
gitweb_run'
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# unborn branches
|
||||
|
||||
test_expect_success \
|
||||
'unborn HEAD: "summary" page (with "heads" subview)' \
|
||||
'git checkout orphan_branch || git checkout --orphan orphan_branch &&
|
||||
test_when_finished "git checkout master" &&
|
||||
gitweb_run "p=.git;a=summary"'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue