diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2015-11-17 03:27:53 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2015-11-17 03:27:55 -0500 |
| commit | d45ee995467709f539bf01607854d1afad11e3b7 (patch) | |
| tree | e8f940b66b6ae06978589349a2ef6e17c5e6cd25 /org.eclipse.jgit/src | |
| parent | 4acff5a59e38eb13d4c7c17117526b5272c6e74f (diff) | |
| parent | e18444de30f1f019b5f7f0a463da42a884cb6a9a (diff) | |
| download | jgit-d45ee995467709f539bf01607854d1afad11e3b7.tar.gz jgit-d45ee995467709f539bf01607854d1afad11e3b7.zip | |
Merge "Fix MissingObjectException in RenameDetector"
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java index 0dc4b05787..444ab1cb83 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java @@ -132,7 +132,11 @@ public abstract class ContentSource { @Override public long size(String path, ObjectId id) throws IOException { - return reader.getObjectSize(id, Constants.OBJ_BLOB); + try { + return reader.getObjectSize(id, Constants.OBJ_BLOB); + } catch (MissingObjectException ignore) { + return 0; + } } @Override |