Browse Source

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
stable-5.4
David Pursehouse 6 years ago
parent
commit
2902255526
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
  2. 11
      tools/version.sh

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

@ -359,6 +359,7 @@ public class ObjectDirectory extends FileObjectDatabase {
// The hasObject call should have only touched the index, // The hasObject call should have only touched the index,
// so any failure here indicates the index is unreadable // so any failure here indicates the index is unreadable
// by this process, and the pack is likewise not readable. // by this process, and the pack is likewise not readable.
LOG.warn("Unable to read packfile " + p.getPackFile(), e);
removePack(p); removePack(p);
} }
} }
@ -651,6 +652,7 @@ public class ObjectDirectory extends FileObjectDatabase {
if ((e instanceof CorruptObjectException) if ((e instanceof CorruptObjectException)
|| (e instanceof PackInvalidException)) { || (e instanceof PackInvalidException)) {
warnTmpl = JGitText.get().corruptPack; warnTmpl = JGitText.get().corruptPack;
LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e);
// Assume the pack is corrupted, and remove it from the list. // Assume the pack is corrupted, and remove it from the list.
removePack(p); removePack(p);
} else if (e instanceof FileNotFoundException) { } else if (e instanceof FileNotFoundException) {

11
tools/version.sh

@ -156,6 +156,17 @@ perl -pi~ -e '
} }
' org.eclipse.jgit.packaging/pom.xml ' 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 ' perl -pi~ -e '
if ($ARGV ne $old_argv) { if ($ARGV ne $old_argv) {
$seen_version = 0; $seen_version = 0;

Loading…
Cancel
Save