diff options
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index ad58231e0..e10283f59 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -613,9 +613,11 @@ sub rcs_getctime ($) { # Remove srcdir prefix $file =~ s/^\Q$config{srcdir}\E\/?//; - my @sha1s = run_or_non('git', 'rev-list', 'HEAD', '--', $file); - my $ci = git_commit_info($sha1s[$#sha1s], 1); - my $ctime = $ci->{'author_epoch'}; + my @raw_lines = run_or_die('git', 'log', '--reverse', '--follow', + '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c', + '-r', '--', $file); + my $first = parse_diff_tree("", \@raw_lines); + my $ctime = $first->{'author_epoch'}; debug("ctime for '$file': ". localtime($ctime)); return $ctime; diff --git a/debian/changelog b/debian/changelog index 22935955a..76094e7a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20091010) UNRELEASED; urgency=low * ikiwiki-calendar: New command automates creation of archive pages using the calendar plugin. + * git: --getctime will now follow renames back to the original creation + of a file. -- Joey Hess <joeyh@debian.org> Sun, 11 Oct 2009 15:54:45 -0400 |