summaryrefslogtreecommitdiff
path: root/merge_test.go
diff options
context:
space:
mode:
authorByoungchan Lee <[email protected]>2021-02-03 12:42:21 +0900
committerGitHub <[email protected]>2021-02-02 19:42:21 -0800
commit07147a8ea8ccf216fa490e7ed4ec84e7c5f5d9ee (patch)
tree100c2994b9f65ec4fbd7fa9a2d44c8156c6b5b22 /merge_test.go
parent4b2ac7c998be677d865367908787f17fb570c679 (diff)
Support git_repository_message, git_repository_message_remove (#734)
Closes #646
Diffstat (limited to 'merge_test.go')
-rw-r--r--merge_test.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/merge_test.go b/merge_test.go
index d49d07c..72b1a26 100644
--- a/merge_test.go
+++ b/merge_test.go
@@ -43,6 +43,14 @@ func TestMergeWithSelf(t *testing.T) {
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) {