projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e7953f
)
skip merges
author
Joey Hess
<joey@gnu.kitenet.net>
Mon, 12 Oct 2009 04:50:48 +0000
(
00:50
-0400)
committer
Joey Hess
<joey@gnu.kitenet.net>
Mon, 12 Oct 2009 04:50:48 +0000
(
00:50
-0400)
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.
IkiWiki/Plugin/git.pm
patch
|
blob
|
history
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\/?//;
- 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;