mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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 <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8ac251b66b
commit
9c0810732c
|
@ -1277,7 +1277,7 @@ sub _temp_cache {
|
||||||
|
|
||||||
my $temp_fd = \$TEMP_FILEMAP{$name};
|
my $temp_fd = \$TEMP_FILEMAP{$name};
|
||||||
if (defined $$temp_fd and $$temp_fd->opened) {
|
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 '" .
|
throw Error::Simple("Temp file with moniker '" .
|
||||||
$name . "' already in use");
|
$name . "' already in use");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue