aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/diff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-10-10 13:36:39 -0700
committerShawn O. Pearce <spearce@spearce.org>2010-10-10 14:39:29 -0700
commit4fc50df97df55b1090d8ef5717805003527742cd (patch)
tree4bd29a1e3a8a62de1f51ee851440aae96a7e785d /org.eclipse.jgit/src/org/eclipse/jgit/diff
parent7a0c126d5fc4789eebebf41331ae70d7492b635c (diff)
downloadjgit-4fc50df97df55b1090d8ef5717805003527742cd.tar.gz
jgit-4fc50df97df55b1090d8ef5717805003527742cd.zip
Fix empty block corner case in PatienceDiff
There is a corner case where we get an EMPTY region during recursion, but we didn't expect to receive that. Its harmless to ignore the region since the region is empty and has no content, so do so rather than throwing an exception Change-Id: I50dcec81ecba763072bb739adfab5879fb48b23a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/diff')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java
index 571a498ae9..dfbf1a49b9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatienceDiff.java
@@ -182,6 +182,8 @@ public class PatienceDiff extends DiffAlgorithm {
break;
case EMPTY:
+ break;
+
default:
throw new IllegalStateException();
}