Merge branch 'sb/sha1-file-cleanup' into next

diff --git a/perl/Git.pm b/perl/Git.pm
index 3179e6efb29a1a88df8f90aa458fbe5f9a41d419..ffa09ace924e0a7b079d039e905363435b08cf9b 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -532,7 +532,7 @@ sub version {
 =cut
 
 sub get_tz_offset {
-       # some systmes don't handle or mishandle %z, so be creative.
+       # some systems don't handle or mishandle %z, so be creative.
        my $t = shift || time;
        my $gm = timegm(localtime($t));
        my $sign = qw( + + - )[ $gm <=> $t ];
@@ -1493,8 +1493,8 @@ sub prefix_lines {
                                        $_ = $2;
                                        last;
                                }
-                               # This is malformed -- just return it as-is for now.
-                               return $_[0];
+                               # This is malformed
+                               throw Error::Simple("invalid quoted path $_[0]");
                        }
                        $_ = $remainder;
                }