urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2009-10-12 00:50:48 -04:00
parent 7e7953f0e2
commit e82b43bf95
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/git.pm
View File

@ -613,7 +613,8 @@ sub rcs_getctime ($) {
# Remove srcdir prefix # Remove srcdir prefix
$file =~ s/^\Q$config{srcdir}\E\/?//; $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', '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
'-r', '--', $file); '-r', '--', $file);
my @ci; my @ci;