Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 077eb2f4ca3b597c155a464567f0235a129daa50..f282a677aaed805528770a6df594cbd452b484a4 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5366,7 +5366,7 @@ sub git_feed {
 
        # log/feed of current (HEAD) branch, log of given branch, history of file/directory
        my $head = $hash || 'HEAD';
-       my @commitlist = parse_commits($head, 150);
+       my @commitlist = parse_commits($head, 150, 0, undef, $file_name);
 
        my %latest_commit;
        my %latest_date;