git: Put -- before the filename when calling git rev-list to avoid warning message...

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 1882b43ef5f1c8e642b429785ca9e55af556ae48..5668936dd0ef9aff1e2f66c7d9987964be4f1647 100644 (file)
--- 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 $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'.") }
        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 dc16f5ac28cab5035e995370e4f651daf9053393..5f2f16c81feb3ec241446bb14c9ef1ab6cfc3d5f 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 15:09:36 -0400