skip merges

git log --follow seems to sometimes show merges from before the file was
ever created. So, skip them, a file shouldn't be first created during a
merge anyway.

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 9ecda4ffbcd03375e4799b4d2bc4aaafa70f28df..c5c83a3a7791b7723f293652b6557fc5f50b558c 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -613,7 +613,8 @@ 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', '--follow',
+       my @raw_lines = run_or_die('git', 'log', 
+               '--follow', '--no-merges',

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