From c30b856d147dd895507c8f2334a11ed4baab6c18 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 27 Aug 2016 13:37:55 -0700 Subject: #3505 use user’s info for committer and author MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/repo_editor.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'models/repo_editor.go') diff --git a/models/repo_editor.go b/models/repo_editor.go index e89ad0a4..a773c8d3 100644 --- a/models/repo_editor.go +++ b/models/repo_editor.go @@ -127,11 +127,11 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) ( if err = git.AddChanges(localPath, true); err != nil { return fmt.Errorf("git add --all: %v", err) - } - - signaure := doer.NewGitSig() - if err = git.CommitChanges(localPath, opts.Message, signaure); err != nil { - return fmt.Errorf("git commit -m %s --author='%s <%s>': %v", opts.Message, signaure.Name, signaure.Email, err) + } else if err = git.CommitChanges(localPath, git.CommitChangesOptions{ + Committer: doer.NewGitSig(), + Message: opts.Message, + }); err != nil { + return fmt.Errorf("CommitChanges: %v", err) } else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil { return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err) } @@ -254,11 +254,11 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) ( if err = git.AddChanges(localPath, true); err != nil { return fmt.Errorf("git add --all: %v", err) - } - - signaure := doer.NewGitSig() - if err = git.CommitChanges(localPath, opts.Message, signaure); err != nil { - return fmt.Errorf("git commit -m %s --author='%s <%s>': %v", opts.Message, signaure.Name, signaure.Email, err) + } else if err = git.CommitChanges(localPath, git.CommitChangesOptions{ + Committer: doer.NewGitSig(), + Message: opts.Message, + }); err != nil { + return fmt.Errorf("CommitChanges: %v", err) } else if err = git.Push(localPath, "origin", opts.Branch); err != nil { return fmt.Errorf("git push origin %s: %v", opts.Branch, err) } -- cgit v1.2.3