IDEA-119855 Github: remove duplicates from "Share On Github" dialog

ChangeListManager can return outdated list of affected files. untracked files from UntrackedFilesHolder are always up to date.
This can lead to file duplication on running action after deleting git repo (all old affected files become untracked, but data is not refreshed yet).
This commit is contained in:
Aleksey Pivovarov
2014-01-27 15:32:36 +04:00
parent e2cdf406a3
commit 4dba37ad73
@@ -288,6 +288,8 @@ public class GithubShareAction extends DumbAwareAction {
final List<VirtualFile> trackedFiles = ChangeListManager.getInstance(project).getAffectedFiles();
final Collection<VirtualFile> untrackedFiles = filterOutIgnored(project,
repository.getUntrackedFilesHolder().retrieveUntrackedFiles());
trackedFiles.removeAll(untrackedFiles); // fix IDEA-119855
final List<VirtualFile> allFiles = new ArrayList<VirtualFile>();
allFiles.addAll(trackedFiles);
allFiles.addAll(untrackedFiles);