(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Plugin / git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index e10283f59a5889802d218bf8d238301a20866562..c5c83a3a7791b7723f293652b6557fc5f50b558c 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -613,11 +613,15 @@ sub rcs_getctime ($) {
        # Remove srcdir prefix
        $file =~ s/^\Q$config{srcdir}\E\/?//;
 
        # Remove srcdir prefix
        $file =~ s/^\Q$config{srcdir}\E\/?//;
 

-       my @raw_lines = run_or_die('git', 'log', '--reverse', '--follow',
+       my @raw_lines = run_or_die('git', 'log', 
+               '--follow', '--no-merges',

                '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
                '-r', '--', $file);
                '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
                '-r', '--', $file);

-       my $first = parse_diff_tree("", \@raw_lines);
-       my $ctime = $first->{'author_epoch'};
+       my @ci;
+       while (my $parsed = parse_diff_tree("", \@raw_lines)) {
+               push @ci, $parsed;
+       }
+       my $ctime = $ci[$#ci]->{'author_epoch'};

        debug("ctime for '$file': ". localtime($ctime));
 
        return $ctime;
        debug("ctime for '$file': ". localtime($ctime));
 
        return $ctime;