diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2013-07-18 17:16:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 20:31:43 -0700 |
| commit | 9c0810732c50106d1a93866ca3fa1285e07778f1 (patch) | |
| tree | aeb18b7fcf511afbdc00817658418103a2e745d0 /perl | |
| parent | 8ac251b66b952b0eddfa4e5bbf08a3c0ae7dbc0b (diff) | |
| download | git-9c0810732c50106d1a93866ca3fa1285e07778f1.tar.gz | |
Git.pm: revert _temp_cache use of temp_is_lockedkm/svn-1.8-serf-only
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 <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Git.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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"); } |