From 0e3f3b809d26de2506e4e8343c3f6ad2e7e33401 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 15 Jul 2016 13:34:15 +0300 Subject: [PATCH] patch: check myIsReversePath when adding "\ No newline at EOF" hopefully, soon this method will be removed completely --- .../intellij/openapi/diff/impl/patch/TextPatchBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java index 187e5ec0d155..deefd7638307 100644 --- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java +++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java @@ -174,11 +174,11 @@ public class TextPatchBuilder { } } - checkPathEndLine(patch, c.getAfter()); + checkPathEndLine(patch, afterRevision); } else if (!beforeRevision.getPath().equals(afterRevision.getPath())) { TextFilePatch movedPatch = buildMovedFile(beforeRevision, afterRevision); - checkPathEndLine(movedPatch, c.getAfter()); + checkPathEndLine(movedPatch, afterRevision); result.add(movedPatch); } }