Fix server error when remaining hunks are comments

If the remaining hunks of a file are empty (because they are dummies
for a file) we shouldn't delete them, but instead leave them intact
for further hunk passes.

Bug: GERRIT-227
Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
index 6e71f37eca..f72a287bc9 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
@@ -312,9 +312,16 @@ class PatchScriptBuilder {
 
         if (end(curEdit, aCur, bCur) && ++curIdx < edits.size()) {
           curEdit = edits.get(curIdx);
-          while (curEdit.getType() == Edit.Type.EMPTY && curEdit != endEdit) {
+          while (curEdit.getType() == Edit.Type.EMPTY) {
+            if (aEnd <= curEdit.getBeginA() || bEnd <= curEdit.getEndB()) {
+              break;
+            }
             edits.remove(curIdx);
-            curEdit = edits.get(curIdx);
+            if (curIdx < edits.size()) {
+              curEdit = edits.get(curIdx);
+            } else {
+              break;
+            }
           }
         }
       }