jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Apply suggestions from code review

This commit is contained in:
lhchavez 2021-02-02 06:27:21 -08:00 committed by GitHub
parent 99c5305166
commit 9b64d2ed6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge_test.go
View File

@ -49,7 +49,7 @@ func TestMergeWithSelf(t *testing.T) {
expectedMessage := "Merge branch 'master'\n" expectedMessage := "Merge branch 'master'\n"
if mergeMessage != expectedMessage { if mergeMessage != expectedMessage {
t.Errorf("mege Meesage = %v, want %v", mergeMessage, expectedMessage) t.Errorf("merge Message = %v, want %v", mergeMessage, expectedMessage)
} }
} }

9
repository.go
View File

@ -689,6 +689,14 @@ func (r *Repository) ClearGitIgnoreRules() error {
return nil 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) { func (r *Repository) Message() (string, error) {
buf := C.git_buf{} buf := C.git_buf{}
defer C.git_buf_dispose(&buf) defer C.git_buf_dispose(&buf)
@ -704,6 +712,7 @@ func (r *Repository) Message() (string, error) {
return C.GoString(buf.ptr), nil return C.GoString(buf.ptr), nil
} }
// RemoveMessage removes git's prepared message.
func (r *Repository) RemoveMessage() error { func (r *Repository) RemoveMessage() error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()