diff options
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 1882b43ef..5668936dd 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -279,7 +279,8 @@ sub git_sha1 (;$) { #{{{ my $file = shift || q{--}; # Ignore error since a non-existing file might be given. - my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file); + my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', + '--', $file); if ($sha1) { ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now } else { debug("Empty sha1sum for '$file'.") } diff --git a/debian/changelog b/debian/changelog index dc16f5ac2..5f2f16c81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ ikiwiki (2.45) UNRELEASED; urgency=low * Fix ugly display when editing a page that has vanished. * srcfile now has an optional second parameter to avoid it throwing an error if the source file does not exist. + * git: Put -- before the filename when calling git rev-list to avoid + warning message when the file doesn't exist. -- Joey Hess <joeyh@debian.org> Sat, 26 Apr 2008 15:09:36 -0400 |