MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: cleanup - remove if with identical branches

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-09-26 19:50:39 +03:00
parent 09204c44f4
commit edf74799e4
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitContentRevision.java
+1 -8
View File
@@ -16,7 +16,6 @@
package git4idea;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.ByteBackedContentRevision;
@@ -26,7 +25,6 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.impl.ContentRevisionCache;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.vcsUtil.VcsFilePathUtil;
import com.intellij.vcsUtil.VcsFileUtil;
import com.intellij.vcsUtil.VcsUtil;
import git4idea.util.GitFileUtils;
@@ -161,12 +159,7 @@ public class GitContentRevision implements ByteBackedContentRevision {
boolean canBeDeleted,
boolean unescapePath) throws VcsException {
String absolutePath = makeAbsolutePath(vcsRoot, path, unescapePath);
FilePath file = VcsUtil.getFilePath(absolutePath, false);
if (canBeDeleted && (! SystemInfo.isFileSystemCaseSensitive) && VcsFilePathUtil.caseDiffers(file.getPath(), absolutePath)) {
// as for deleted file
file = VcsUtil.getFilePath(absolutePath, false);
}
return file;
return VcsUtil.getFilePath(absolutePath, false);
}
@NotNull