From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 04:50:48 +0000 (-0400)
Subject: skip merges
X-Git-Tag: 3.20091017~27^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e82b43bf950e1ff11683ae96abdd29879f92488a;p=ikiwiki.git

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 9ecda4ffb..c5c83a3a7 100644
--- 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\/?//;
 
-	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;