summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-14 07:12:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-14 07:12:51 (GMT)
commite98c6a168635f3fedadc3963680eba69d2e42324 (patch)
tree2f1b4b81a6bc85d61bbfdb0b6d47808207cc4d32 /perl
parent6a15416a89b8e0095de6dd0d733b4f4545c27d16 (diff)
parent4f8b8992ef0c009822cdca18d32ddf3a124ee284 (diff)
downloadgit-e98c6a168635f3fedadc3963680eba69d2e42324.zip
git-e98c6a168635f3fedadc3963680eba69d2e42324.tar.gz
git-e98c6a168635f3fedadc3963680eba69d2e42324.tar.bz2
Merge branch 'maint'
* maint: fast-import: Cleanup mode setting. Git.pm: call Error::Simple() properly
Diffstat (limited to 'perl')
-rw-r--r--perl/Git.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl/Git.pm b/perl/Git.pm
index ad0f530..7d7f2b1 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) {