diff options
-rw-r--r-- | IkiWiki/Rcs/git.pm | 6 | ||||
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 563d10859..070bf3208 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -460,9 +460,9 @@ sub rcs_notify () { #{{{ } #}}} sub rcs_getctime ($) { #{{{ - # Get the ctime of file. - - my ($file) = @_; + my $file=shift; + # Remove srcdir prefix + $file =~ s/^\Q$config{srcdir}\E\/?//; my $sha1 = git_sha1($file); my $ci = git_commit_info($sha1); diff --git a/debian/changelog b/debian/changelog index 3f552f795..ba24beee9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ikiwiki (2.10) UNRELEASED; urgency=low * Tidy ctime debug output for git. + * French translation update. Closes: #445923 + * Fix --get-ctime with git, needed to remove srcdir from filename. - -- Joey Hess <joeyh@debian.org> Thu, 04 Oct 2007 04:59:51 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2007 14:14:18 -0400 ikiwiki (2.9) unstable; urgency=low diff --git a/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn b/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn index 981a8f374..d811b8ea9 100644 --- a/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn +++ b/doc/todo/git-rev-list_requires_relative_path___40__fixes_git_ctime__41__.mdwn @@ -21,4 +21,4 @@ Better to strip the path out in getctime, I guess. --[[Joey]] -[[tag patch]] +[[tag patch done]] |