blob: 9bf9b9d603277cb1f12676c7596f0a716b2d2c83 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
package git
import (
"testing"
)
func Test_Merge_With_Self(t *testing.T) {
repo := createTestRepo(t)
seedTestRepo(t, repo)
master, err := repo.LookupReference("refs/heads/master")
checkFatal(t, err)
mergeHead, err := repo.MergeHeadFromRef(master)
checkFatal(t, err)
options := DefaultMergeOptions()
mergeHeads := make([]*MergeHead, 1)
mergeHeads[0] = mergeHead
results, err := repo.Merge(mergeHeads, options)
checkFatal(t, err)
if !results.IsUpToDate() {
t.Fatal("Expected up to date")
}
}
|
