From 9b64d2ed6e4f1413749d725b88fbfd586bf657cb Mon Sep 17 00:00:00 2001 From: lhchavez Date: Tue, 2 Feb 2021 06:27:21 -0800 Subject: [PATCH] Apply suggestions from code review --- merge_test.go | 2 +- repository.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/merge_test.go b/merge_test.go index 981f672..72b1a26 100644 --- a/merge_test.go +++ b/merge_test.go @@ -49,7 +49,7 @@ func TestMergeWithSelf(t *testing.T) { expectedMessage := "Merge branch 'master'\n" if mergeMessage != expectedMessage { - t.Errorf("mege Meesage = %v, want %v", mergeMessage, expectedMessage) + t.Errorf("merge Message = %v, want %v", mergeMessage, expectedMessage) } } diff --git a/repository.go b/repository.go index b0ea84c..bba5700 100644 --- a/repository.go +++ b/repository.go @@ -689,6 +689,14 @@ func (r *Repository) ClearGitIgnoreRules() error { return nil } +// Message retrieves git's prepared message. +// Operations such as git revert/cherry-pick/merge with the -n option stop just +// short of creating a commit with the changes and save their prepared message +// in .git/MERGE_MSG so the next git-commit execution can present it to the +// user for them to amend if they wish. +// +// Use this function to get the contents of this file. Don't forget to remove +// the file after you create the commit. func (r *Repository) Message() (string, error) { buf := C.git_buf{} defer C.git_buf_dispose(&buf) @@ -704,6 +712,7 @@ func (r *Repository) Message() (string, error) { return C.GoString(buf.ptr), nil } +// RemoveMessage removes git's prepared message. func (r *Repository) RemoveMessage() error { runtime.LockOSThread() defer runtime.UnlockOSThread()