Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/git2go/merge_test.go')
-rw-r--r--internal/git2go/merge_test.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/internal/git2go/merge_test.go b/internal/git2go/merge_test.go
index 1de4f3cab..5f0bc60c4 100644
--- a/internal/git2go/merge_test.go
+++ b/internal/git2go/merge_test.go
@@ -1,6 +1,7 @@
package git2go
import (
+ "bytes"
"testing"
"time"
@@ -108,9 +109,10 @@ func TestGit2Go_MergeCommandSerialization(t *testing.T) {
func TestGit2Go_MergeResultSerialization(t *testing.T) {
serializeResult := func(t *testing.T, result MergeResult) string {
- serialized, err := result.Serialize()
+ var buf bytes.Buffer
+ err := result.SerializeTo(&buf)
require.NoError(t, err)
- return serialized
+ return buf.String()
}
testcases := []struct {