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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-02-01 15:58:32 +01:00
parent cb0ed1e032 131aff7914
commit b5fde10ec5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/repo/GitWorkTreeTest.kt
+4 -2
View File
@@ -59,7 +59,8 @@ class GitWorkTreeTest : GitPlatformTest() {
val branches = myRepo.branches
val expectedBranches = listOf("master", "feature", "project") // 'project' is created automatically by `git worktree add`
assertSameElements("", branches.localBranches.map {it.name}, expectedBranches)
assertSameElements("Local branches are identified incorrectly",
branches.localBranches.map {it.name}, expectedBranches)
assertBranchHash(masterHead, branches, "master")
assertBranchHash(featureHead, branches, "feature")
}
@@ -80,7 +81,8 @@ class GitWorkTreeTest : GitPlatformTest() {
myRepo.update()
val branches = myRepo.branches
assertSameElements("", branches.remoteBranches.map {it.nameForLocalOperations}, listOf("origin/master", "origin/feature"))
assertSameElements("Remote branches are identified incorrectly",
branches.remoteBranches.map {it.nameForLocalOperations}, listOf("origin/master", "origin/feature"))
assertBranchHash(masterHead, branches, "origin/master")
assertBranchHash(featureHead, branches, "origin/feature")
}