From edf74799e4dca017df1d220c27c19e2307081d12 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 13 Sep 2017 15:41:14 +0300 Subject: [PATCH] git: cleanup - remove `if` with identical branches --- plugins/git4idea/src/git4idea/GitContentRevision.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/git4idea/src/git4idea/GitContentRevision.java b/plugins/git4idea/src/git4idea/GitContentRevision.java index 45ef0a355d0a..3c41fc5956ad 100644 --- a/plugins/git4idea/src/git4idea/GitContentRevision.java +++ b/plugins/git4idea/src/git4idea/GitContentRevision.java @@ -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