From 76e62bbc0e7c2dda6b7bef2b6c4617c60d1d499c Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Fri, 25 Sep 2015 14:05:10 +0300 Subject: [PATCH] EA-73614 - NPE: UnifiedDiffWriter.writeRevisionHeading while saving remaining patches --- .../intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java index 612a22dfd60e..56997f1ea61f 100644 --- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java +++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java @@ -126,7 +126,9 @@ public class UnifiedDiffWriter { writer.write(prefix + " "); writer.write(revisionPath); writer.write("\t"); - writer.write(revisionName); + if (!StringUtil.isEmptyOrSpaces(revisionName)) { + writer.write(revisionName); + } writer.write(lineSeparator); }