wumpz · wumpz · commit de04bd688a0e · 2020-08-09T21:44:28.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
@@ -59,7 +59,7 @@ public static void write(UnifiedDiff diff, Function<String, List<String>> origin
                     writer.accept("index " + file.getIndex());
                 }
 
-                writer.accept("--- " + file.getFromFile());
+                writer.accept("--- " + (file.getFromFile() == null ? "/dev/null" : file.getFromFile()));
 
                 if (file.getToFile() != null) {
                     writer.accept("+++ " + file.getToFile());
@@ -96,7 +96,7 @@ public static void write(UnifiedDiff diff, Function<String, List<String>> origin
 
                 }
                 // don't forget to process the last set of Deltas
-                processDeltas(writer, originalLines, deltas, contextSize, 
+                processDeltas(writer, originalLines, deltas, contextSize,
                         patchDeltas.size() == 1 && file.getFromFile() == null);
             }
 
@@ -156,7 +156,7 @@ private static void processDeltas(Consumer<String> writer,
             AbstractDelta<String> nextDelta = deltas.get(deltaIndex);
             int intermediateStart = curDelta.getSource().getPosition()
                     + curDelta.getSource().getLines().size();
-            for (line = intermediateStart; line < nextDelta.getSource().getPosition() 
+            for (line = intermediateStart; line < nextDelta.getSource().getPosition()
                     && line < origLines.size(); line++) {
                 // output the code between the last Delta and this one
                 buffer.add(" " + origLines.get(line));
