From 8a658f02f6413edac6f9b1e4bb44f325f6ebb54e Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 25 Dec 2009 17:43:28 +0300 Subject: [PATCH] VCS: fix for patch with only new files in it --- .../com/intellij/openapi/vcs/changes/patch/OneBaseStrategy.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/OneBaseStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/OneBaseStrategy.java index 7cdee6a9fb..33a1c634b9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/OneBaseStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/OneBaseStrategy.java @@ -74,7 +74,12 @@ class OneBaseStrategy extends AutoMatchStrategy { @Override public void processCreation(TextFilePatch creation) { if (! mySucceeded) return; - final FilePatchInProgress filePatchInProgress = new FilePatchInProgress(creation, null, myVariants.keySet().iterator().next()); + final FilePatchInProgress filePatchInProgress; + if (myVariants.isEmpty()) { + filePatchInProgress = new FilePatchInProgress(creation, null, myBaseDir); + } else { + filePatchInProgress = new FilePatchInProgress(creation, null, myVariants.keySet().iterator().next()); + } myResult.add(filePatchInProgress); } -- 2.11.4.GIT