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

Don't read branch.lock files as branches

Browse Source 
Since Git 2.10 (92b1551b1d407065f961ffd1d972481063a0edcc) such
lock files can be created to synchronize ref updates.

We used to read them as branches and later fail either because no hash
was available, or because the files were removed.
This commit is contained in:
Kirill Likhodedov
2017-03-02 22:58:28 +00:00
parent 3a3cbc92d6
commit 0668f251cf
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/repo/GitRepositoryReader.java
+2 -1
View File
@@ -31,6 +31,7 @@ import com.intellij.vcs.log.Hash;
import com.intellij.vcs.log.impl.HashImpl; import com.intellij.vcs.log.impl.HashImpl;
import git4idea.*; import git4idea.*;
import git4idea.branch.GitBranchUtil; import git4idea.branch.GitBranchUtil;
import git4idea.validators.GitRefNameValidator;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -272,7 +273,7 @@ class GitRepositoryReader {
if (relativePath != null) { if (relativePath != null) {
String branchName = prefix + FileUtil.toSystemIndependentName(relativePath); String branchName = prefix + FileUtil.toSystemIndependentName(relativePath);
String hash = loadHashFromBranchFile(file); String hash = loadHashFromBranchFile(file);
if (hash != null) { if (hash != null && GitRefNameValidator.getInstance().checkInput(branchName)) {
result.put(branchName, hash); result.put(branchName, hash);
} }
} }
plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.kt
+10 -4
View File
@@ -19,13 +19,11 @@ import com.intellij.dvcs.repo.Repository.State
import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.SystemInfo
import git4idea.GitLocalBranch import git4idea.GitLocalBranch
import git4idea.branch.GitBranchUtil import git4idea.branch.GitBranchUtil
import git4idea.test.*
import git4idea.test.GitScenarios.commit import git4idea.test.GitScenarios.commit
import git4idea.test.GitScenarios.conflict import git4idea.test.GitScenarios.conflict
import git4idea.test.GitSingleRepoTest
import git4idea.test.makeCommit
import git4idea.test.git
import git4idea.test.last
import org.junit.Assume.assumeTrue import org.junit.Assume.assumeTrue
import java.io.File
import kotlin.test.assertNotEquals import kotlin.test.assertNotEquals
/** /**
@@ -153,6 +151,14 @@ class GitRepositoryReaderNewTest : GitSingleRepoTest() {
assertNotEquals(GitLocalBranch("UpperCase"), GitLocalBranch("uppercase")) assertNotEquals(GitLocalBranch("UpperCase"), GitLocalBranch("uppercase"))
} }
fun `test non-branch files are ignored`() {
tac("f.txt")
assertTrue(File(myRepo.repositoryFiles.refsHeadsFile, "master.lock").createNewFile())
myRepo.update()
assertSameElements(listOf("master"), myRepo.branches.localBranches.map { it.name })
}
private fun moveToDetachedHead(): String { private fun moveToDetachedHead(): String {
makeCommit("file.txt") makeCommit("file.txt")
makeCommit("file.txt") makeCommit("file.txt")