From 9c0810732c50106d1a93866ca3fa1285e07778f1 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 18 Jul 2013 17:16:16 -0700 Subject: Git.pm: revert _temp_cache use of temp_is_locked When the temp_is_locked function was introduced, there was a desire to make _temp_cache use it. Unfortunately due to the various tests and logic flow involved changing the _temp_cache function to use the new temp_is_locked function is problematic as _temp_cache needs a slightly different test than is provided by the temp_is_locked function. This change reverts use of temp_is_locked in the _temp_cache function and restores the original code that existed there before the temp_is_locked function was added. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- perl/Git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git.pm b/perl/Git.pm index 0ba15b9a56..204fdc6737 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -1277,7 +1277,7 @@ sub _temp_cache { my $temp_fd = \$TEMP_FILEMAP{$name}; if (defined $$temp_fd and $$temp_fd->opened) { - if (temp_is_locked($name)) { + if ($TEMP_FILES{$$temp_fd}{locked}) { throw Error::Simple("Temp file with moniker '" . $name . "' already in use"); } -- cgit v1.2.1