Merge pull request msysgit#246 from uecasm/patch-1

dscho · dscho · commit 6c2f69d7beb2 · 2015-08-30T18:50:26.000+02:00
Verify memoized files can be reloaded before using them
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
@@ -1585,6 +1585,11 @@ sub tie_for_persistent_memoization {
 	if ($memo_backend > 0) {
 		tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml";
 	} else {
+		# first verify that any existing file can actually be loaded
+		# (it may have been saved by an incompatible version)
+		if (-e "$path.db") {
+			unlink "$path.db" unless eval { retrieve("$path.db"); 1 };
+		}
 		tie %$hash => 'Memoize::Storable', "$path.db", 'nstore';
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1585,6 +1585,11 @@ sub tie_for_persistent_memoization {`
`1585`	`1585`	`if ($memo_backend > 0) {`
`1586`	`1586`	`tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml";`
`1587`	`1587`	`} else {`
	`1588`	`+ # first verify that any existing file can actually be loaded`
	`1589`	`+ # (it may have been saved by an incompatible version)`
	`1590`	`+ if (-e "$path.db") {`
	`1591`	`+ unlink "$path.db" unless eval { retrieve("$path.db"); 1 };`
	`1592`	`+ }`
`1588`	`1593`	`tie %$hash => 'Memoize::Storable', "$path.db", 'nstore';`
`1589`	`1594`	`}`
`1590`	`1595`	`}`