Merge branch 'stable-5.3'
* stable-5.3: ObjectDirectory: extra logging on packfile exceptions Prepare 5.3.0-SNAPSHOT builds JGit v5.3.0.201901162155-m1 Fix tools/version.sh JGit v5.3.0.201901161700-m1 Change-Id: I3c511fbc08f21eec5bb49d443de33d43094da4a4
This commit is contained in:
commit
2902255526
|
@ -359,6 +359,7 @@ boolean hasPackedObject(AnyObjectId objectId) {
|
|||
// The hasObject call should have only touched the index,
|
||||
// so any failure here indicates the index is unreadable
|
||||
// by this process, and the pack is likewise not readable.
|
||||
LOG.warn("Unable to read packfile " + p.getPackFile(), e);
|
||||
removePack(p);
|
||||
}
|
||||
}
|
||||
|
@ -651,6 +652,7 @@ private void handlePackError(IOException e, PackFile p) {
|
|||
if ((e instanceof CorruptObjectException)
|
||||
|| (e instanceof PackInvalidException)) {
|
||||
warnTmpl = JGitText.get().corruptPack;
|
||||
LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e);
|
||||
// Assume the pack is corrupted, and remove it from the list.
|
||||
removePack(p);
|
||||
} else if (e instanceof FileNotFoundException) {
|
||||
|
|
|
@ -156,6 +156,17 @@ perl -pi~ -e '
|
|||
}
|
||||
' org.eclipse.jgit.packaging/pom.xml
|
||||
|
||||
perl -pi~ -e '
|
||||
if ($ARGV ne $old_argv) {
|
||||
$seen_version = 0;
|
||||
$old_argv = $ARGV;
|
||||
}
|
||||
if ($seen_version < 18) {
|
||||
$seen_version++ if
|
||||
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
|
||||
}
|
||||
' org.eclipse.jgit.coverage/pom.xml
|
||||
|
||||
perl -pi~ -e '
|
||||
if ($ARGV ne $old_argv) {
|
||||
$seen_version = 0;
|
||||
|
|
Loading…
Reference in New Issue