diff options
| author | lhchavez <[email protected]> | 2020-02-23 14:58:21 +0000 |
|---|---|---|
| committer | lhchavez <[email protected]> | 2020-02-23 14:58:21 +0000 |
| commit | a140f2310f56eb06d37454514e67647a8a49d197 (patch) | |
| tree | fb156488aa27d753c7fe7864b9917a48d027b38e /merge_test.go | |
| parent | 627447092fa24035ed3cd4cf31932dbef6f5a57f (diff) | |
Add test and runtime.KeepAlive()
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/merge_test.go b/merge_test.go index f2c84bc..7cf034f 100644 --- a/merge_test.go +++ b/merge_test.go @@ -5,6 +5,22 @@ import ( "time" ) +func TestAnnotatedCommitFromRevspec(t *testing.T) { + t.Parallel() + repo := createTestRepo(t) + defer cleanupTestRepo(t, repo) + + seedTestRepo(t, repo) + + mergeHead, err := repo.AnnotatedCommitFromRevspec("refs/heads/master") + checkFatal(t, err) + + expectedId := "473bf778b67b6d53e2ab289e0f1a2e8addef2fc2" + if mergeHead.Id().String() != expectedId { + t.Errorf("mergeHead.Id() = %v, want %v", mergeHead.Id(), expectedId) + } +} + func TestMergeWithSelf(t *testing.T) { t.Parallel() repo := createTestRepo(t) @@ -18,6 +34,11 @@ func TestMergeWithSelf(t *testing.T) { 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) |
