Skip to content

Commit e22c522

Browse files
committed
Merge branch 'jn/gitweb-unborn-head' into maint
* jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
2 parents bdf26fc + fd49e56 commit e22c522

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

gitweb/gitweb.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5568,7 +5568,7 @@ sub git_tags_body {
55685568

55695569
sub git_heads_body {
55705570
# uses global variable $project
5571-
my ($headlist, $head, $from, $to, $extra) = @_;
5571+
my ($headlist, $head_at, $from, $to, $extra) = @_;
55725572
$from = 0 unless defined $from;
55735573
$to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);
55745574

@@ -5577,7 +5577,7 @@ sub git_heads_body {
55775577
for (my $i = $from; $i <= $to; $i++) {
55785578
my $entry = $headlist->[$i];
55795579
my %ref = %$entry;
5580-
my $curr = $ref{'id'} eq $head;
5580+
my $curr = defined $head_at && $ref{'id'} eq $head_at;
55815581
if ($alternate) {
55825582
print "<tr class=\"dark\">\n";
55835583
} else {

t/t9500-gitweb-standalone-no-errors.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,4 +770,13 @@ test_expect_success \
770770
'echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
771771
gitweb_run'
772772

773+
# ----------------------------------------------------------------------
774+
# unborn branches
775+
776+
test_expect_success \
777+
'unborn HEAD: "summary" page (with "heads" subview)' \
778+
'git checkout orphan_branch || git checkout --orphan orphan_branch &&
779+
test_when_finished "git checkout master" &&
780+
gitweb_run "p=.git;a=summary"'
781+
773782
test_done

0 commit comments

Comments
 (0)