diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-14 07:10:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-14 07:10:50 (GMT) |
| commit | 4f8b8992ef0c009822cdca18d32ddf3a124ee284 (patch) | |
| tree | d6688aedd217cdd9f46962af57432265e9b5ccff /perl | |
| parent | 885a1ffb936cb8e32a15413a9a2404a4b4200f62 (diff) | |
| parent | 3d1d81eba29d5cfc5b214dc049b743ffbe032ef4 (diff) | |
| download | git-4f8b8992ef0c009822cdca18d32ddf3a124ee284.zip git-4f8b8992ef0c009822cdca18d32ddf3a124ee284.tar.gz git-4f8b8992ef0c009822cdca18d32ddf3a124ee284.tar.bz2 | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
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 8392a68..e9f8c9c 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -1010,8 +1010,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) { |