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

dscho · dscho · commit f94f9a7d48ba · 2016-03-18T01:11:14.000+01:00
Verify memoized files can be reloaded before using them
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
@@ -1653,6 +1653,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
`@@ -1653,6 +1653,11 @@ sub tie_for_persistent_memoization {`
`1653`	`1653`	`if ($memo_backend > 0) {`
`1654`	`1654`	`tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml";`
`1655`	`1655`	`} else {`
	`1656`	`+ # first verify that any existing file can actually be loaded`
	`1657`	`+ # (it may have been saved by an incompatible version)`
	`1658`	`+ if (-e "$path.db") {`
	`1659`	`+ unlink "$path.db" unless eval { retrieve("$path.db"); 1 };`
	`1660`	`+ }`
`1656`	`1661`	`tie %$hash => 'Memoize::Storable', "$path.db", 'nstore';`
`1657`	`1662`	`}`
`1658`	`1663`	`}`