(t *testing.T)
| 54 | } |
| 55 | |
| 56 | func TestMergeAnalysisWithSelf(t *testing.T) { |
| 57 | t.Parallel() |
| 58 | repo := createTestRepo(t) |
| 59 | defer cleanupTestRepo(t, repo) |
| 60 | |
| 61 | seedTestRepo(t, repo) |
| 62 | |
| 63 | master, err := repo.References.Lookup("refs/heads/master") |
| 64 | checkFatal(t, err) |
| 65 | |
| 66 | mergeHead, err := repo.AnnotatedCommitFromRef(master) |
| 67 | checkFatal(t, err) |
| 68 | |
| 69 | mergeHeads := make([]*AnnotatedCommit, 1) |
| 70 | mergeHeads[0] = mergeHead |
| 71 | a, _, err := repo.MergeAnalysis(mergeHeads) |
| 72 | checkFatal(t, err) |
| 73 | |
| 74 | if a != MergeAnalysisUpToDate { |
| 75 | t.Fatalf("Expected up to date merge, not %v", a) |
| 76 | } |
| 77 | } |
| 78 | |
| 79 | func TestMergeSameFile(t *testing.T) { |
| 80 | t.Parallel() |
nothing calls this directly
no test coverage detected
searching dependent graphs…