Function TestMergeWithSelf

merge_test.go:24–54

(t *testing.T)

}

func TestMergeWithSelf(t *testing.T) {
	t.Parallel()
	repo := createTestRepo(t)
	defer cleanupTestRepo(t, repo)

	seedTestRepo(t, repo)

	master, err := repo.References.Lookup("refs/heads/master")
	checkFatal(t, err)

	mergeHead, err := repo.AnnotatedCommitFromRef(master)
	checkFatal(t, err)

	expectedId := "473bf778b67b6d53e2ab289e0f1a2e8addef2fc2"
	if mergeHead.Id().String() != expectedId {
		t.Errorf("mergeHead.Id() = %v, want %v", mergeHead.Id(), expectedId)
	}

	mergeHeads := make([]*AnnotatedCommit, 1)
	mergeHeads[0] = mergeHead
	err = repo.Merge(mergeHeads, nil, nil)
	checkFatal(t, err)

	mergeMessage, err := repo.Message()
	checkFatal(t, err)

	expectedMessage := "Merge branch 'master'\n"
	if mergeMessage != expectedMessage {
		t.Errorf("merge Message = %v, want %v", mergeMessage, expectedMessage)
	}
}

func TestMergeAnalysisWithSelf(t *testing.T) {
	t.Parallel()