diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:12:51 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:12:51 -0800 |
commit | e98c6a168635f3fedadc3963680eba69d2e42324 (patch) | |
tree | 2f1b4b81a6bc85d61bbfdb0b6d47808207cc4d32 /perl | |
parent | Merge branch 'nd/grep-assume-unchanged' (diff) | |
parent | Merge branch 'maint-1.6.0' into maint (diff) | |
download | tgif-e98c6a168635f3fedadc3963680eba69d2e42324.tar.xz |
Merge branch 'maint'
* maint:
fast-import: Cleanup mode setting.
Git.pm: call Error::Simple() properly
Diffstat (limited to 'perl')
-rw-r--r-- | perl/Git.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl/Git.pm b/perl/Git.pm index ad0f530445..7d7f2b1d36 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -1011,8 +1011,8 @@ sub _temp_cache { my $temp_fd = \$TEMP_FILEMAP{$name}; if (defined $$temp_fd and $$temp_fd->opened) { if ($TEMP_FILES{$$temp_fd}{locked}) { - throw Error::Simple("Temp file with moniker '", - $name, "' already in use"); + throw Error::Simple("Temp file with moniker '" . + $name . "' already in use"); } } else { if (defined $$temp_fd) { |