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

Merge branch 'maint'

Browse Source 
* maint:
  gitweb: Fix 'history' view for deleted files with history
  Document that WebDAV doesn't need git on the server, and works over SSL
  git-remote: reject adding remotes with invalid names
  am: POSIX portability fix
This commit is contained in:
Junio C Hamano
2008-04-18 22:58:32 -07:00
parent 9a49e00b9a 5634cf2476
commit d9f39d9838
8 changed files with 97 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gitweb/gitweb.perl
View File

@ -5176,14 +5176,26 @@ sub git_history {
my $refs = git_get_references();
my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
my @commitlist = parse_commits($hash_base, 101, (100 * $page),
$file_name, "--full-history");
if (!@commitlist) {
die_error('404 Not Found', "No such file or directory on given branch");
}
if (!defined $hash && defined $file_name) {
$hash = git_get_hash_by_path($hash_base, $file_name);
# some commits could have deleted file in question,
# and not have it in tree, but one of them has to have it
for (my $i = 0; $i <= @commitlist; $i++) {
$hash = git_get_hash_by_path($commitlist[$i]{'id'}, $file_name);
last if defined $hash;
}
}
if (defined $hash) {
$ftype = git_get_type($hash);
}
my @commitlist = parse_commits($hash_base, 101, (100 * $page), $file_name, "--full-history");
if (!defined $ftype) {
die_error(undef, "Unknown type of object");
}
my $paging_nav = '';
if ($page > 0) {