mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/gitweb-unborn-head' into maint

Browse Source 
* jn/gitweb-unborn-head:
  gitweb: Fix "heads" view when there is no current branch
This commit is contained in:
Junio C Hamano 2012-02-27 15:33:26 -08:00
commit e22c522730
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitweb/gitweb.perl
View File

@ -5568,7 +5568,7 @@ sub git_tags_body {
sub git_heads_body { sub git_heads_body {
# uses global variable $project # uses global variable $project
my ($headlist, $head, $from, $to, $extra) = @_; my ($headlist, $head_at, $from, $to, $extra) = @_;
$from = 0 unless defined $from; $from = 0 unless defined $from;
$to = $#{$headlist} if (!defined $to || $#{$headlist} < $to); $to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);
@ -5577,7 +5577,7 @@ sub git_heads_body {
for (my $i = $from; $i <= $to; $i++) { for (my $i = $from; $i <= $to; $i++) {
my $entry = $headlist->[$i]; my $entry = $headlist->[$i];
my %ref = %$entry; my %ref = %$entry;
my $curr = $ref{'id'} eq $head; my $curr = defined $head_at && $ref{'id'} eq $head_at;
if ($alternate) { if ($alternate) {
print "<tr class=\"dark\">\n"; print "<tr class=\"dark\">\n";
} else { } else {

9
t/t9500-gitweb-standalone-no-errors.sh
View File

@ -770,4 +770,13 @@ test_expect_success \
'echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl && 'echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
gitweb_run' 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 test_done