brace style and layout

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 9ecda4ffbcd03375e4799b4d2bc4aaafa70f28df..786c7b1f246652d5d0ba73ec0f839535be5e7430 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -419,7 +419,10 @@ sub git_sha1 (;$) {
                '--', $file);
        if ($sha1) {
                ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
-       } else { debug("Empty sha1sum for '$file'.") }
+       }
+       else {
+               debug("Empty sha1sum for '$file'.");
+       }
        return defined $sha1 ? $sha1 : q{};
 }
 
@@ -613,7 +616,8 @@ sub rcs_getctime ($) {
        # 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;