diff options
Diffstat (limited to 'plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java')
| -rw-r--r-- | plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java index d4b3a0fbf1d8..bd8635db89be 100644 --- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java +++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java @@ -140,8 +140,8 @@ public class GitCherryPicker { "Please move, remove or add them before you can cherry-pick. <a href='view'>View them</a>"; description += getSuccessfulCommitDetailsIfAny(successfulCommits); - UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, untrackedFilesDetector.getFiles(), - "cherry-pick", description); + UntrackedFilesNotifier.notifyUntrackedFilesOverwrittenBy(myProject, repository.getRoot(), + untrackedFilesDetector.getRelativeFilePaths(), "cherry-pick", description); return false; } else if (localChangesOverwrittenDetector.hasHappened()) { |