summaryrefslogtreecommitdiff
path: root/merge_test.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2015-06-28 01:12:32 +0200
committerCarlos Martín Nieto <[email protected]>2015-06-28 01:12:32 +0200
commit01a2d8d38d4683c6e29da21240ffff7ae7b3a680 (patch)
tree6bc5088c1e062ab02a97e5f49bbe6f58159ba126 /merge_test.go
parentd2808d16101e113096b3a1c02e3f91122de74f15 (diff)
Create a ReferenceCollection for managing references
As with the other commits, this clears up the clutter in naming and around the Repository's API.
Diffstat (limited to 'merge_test.go')
-rw-r--r--merge_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge_test.go b/merge_test.go
index 0b1faca..5c62f5c 100644
--- a/merge_test.go
+++ b/merge_test.go
@@ -10,7 +10,7 @@ func TestMergeWithSelf(t *testing.T) {
seedTestRepo(t, repo)
- master, err := repo.LookupReference("refs/heads/master")
+ master, err := repo.References.Lookup("refs/heads/master")
checkFatal(t, err)
mergeHead, err := repo.AnnotatedCommitFromRef(master)
@@ -28,7 +28,7 @@ func TestMergeAnalysisWithSelf(t *testing.T) {
seedTestRepo(t, repo)
- master, err := repo.LookupReference("refs/heads/master")
+ master, err := repo.References.Lookup("refs/heads/master")
checkFatal(t, err)
mergeHead, err := repo.AnnotatedCommitFromRef(master)