[PATCH 0/1] incremental update against 'next' branch

[PATCH 0/1] incremental update against 'next' branch

[Kyle J. McKay]

NOTE: This patch requires:

  4e63dcc Git.pm: add new temp_is_locked function

which is currently in next.

Versions v2-v3 of the "allow git-svn fetching to work using serf" patch
introduced a bug when attempting to change the Git.pm _temp_cache function
to use the new temp_is_locked function at the suggestion of a reviewer.

This patch reverts that change as the logic in _temp_cache isn't really
conducive to using temp_is_locked because its tests are not exactly the
same as the ones in temp_is_locked.

Kyle J. McKay (1):
  Git.pm: revert _temp_cache use of temp_is_locked

 perl/Git.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.3

[PATCH 1/1] Git.pm: revert _temp_cache use of temp_is_locked

[Kyle J. McKay]

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>
---
 perl/Git.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/Git.pm b/perl/Git.pm
index 0ba15b9..204fdc6 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");
 		}
-- 
1.8.3