diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-12 00:50:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-12 00:50:48 -0400 |
| commit | e82b43bf950e1ff11683ae96abdd29879f92488a (patch) | |
| tree | c05e23715e971a2065e7a01782f556f8c0bc699a /IkiWiki/Plugin | |
| parent | 7e7953f0e240bc0e9201942dd88a4f911904d151 (diff) | |
| download | ikiwiki-e82b43bf950e1ff11683ae96abdd29879f92488a.tar ikiwiki-e82b43bf950e1ff11683ae96abdd29879f92488a.tar.gz | |
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.
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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; |