Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
1.9 KiB
69 lines
1.9 KiB
// Copyright 2015 The Gogs Authors. All rights reserved. |
|
// Copyright 2019 The Gitea Authors. All rights reserved. |
|
// Use of this source code is governed by a MIT-style |
|
// license that can be found in the LICENSE file. |
|
|
|
package git |
|
|
|
import ( |
|
"bytes" |
|
"fmt" |
|
"os" |
|
"strings" |
|
"time" |
|
) |
|
|
|
// CommitTreeOpts represents the possible options to CommitTree |
|
type CommitTreeOpts struct { |
|
Parents []string |
|
Message string |
|
KeyID string |
|
NoGPGSign bool |
|
AlwaysSign bool |
|
} |
|
|
|
// CommitTree creates a commit from a given tree id for the user with provided message |
|
func (repo *Repository) CommitTree(author, committer *Signature, tree *Tree, opts CommitTreeOpts) (SHA1, error) { |
|
err := LoadGitVersion() |
|
if err != nil { |
|
return SHA1{}, err |
|
} |
|
|
|
commitTimeStr := time.Now().Format(time.RFC3339) |
|
|
|
// Because this may call hooks we should pass in the environment |
|
env := append(os.Environ(), |
|
"GIT_AUTHOR_NAME="+author.Name, |
|
"GIT_AUTHOR_EMAIL="+author.Email, |
|
"GIT_AUTHOR_DATE="+commitTimeStr, |
|
"GIT_COMMITTER_NAME="+committer.Name, |
|
"GIT_COMMITTER_EMAIL="+committer.Email, |
|
"GIT_COMMITTER_DATE="+commitTimeStr, |
|
) |
|
cmd := NewCommandContext(repo.Ctx, "commit-tree", tree.ID.String()) |
|
|
|
for _, parent := range opts.Parents { |
|
cmd.AddArguments("-p", parent) |
|
} |
|
|
|
messageBytes := new(bytes.Buffer) |
|
_, _ = messageBytes.WriteString(opts.Message) |
|
_, _ = messageBytes.WriteString("\n") |
|
|
|
if CheckGitVersionAtLeast("1.7.9") == nil && (opts.KeyID != "" || opts.AlwaysSign) { |
|
cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID)) |
|
} |
|
|
|
if CheckGitVersionAtLeast("2.0.0") == nil && opts.NoGPGSign { |
|
cmd.AddArguments("--no-gpg-sign") |
|
} |
|
|
|
stdout := new(bytes.Buffer) |
|
stderr := new(bytes.Buffer) |
|
err = cmd.RunInDirTimeoutEnvFullPipeline(env, -1, repo.Path, stdout, stderr, messageBytes) |
|
|
|
if err != nil { |
|
return SHA1{}, ConcatenateError(err, stderr.String()) |
|
} |
|
return NewIDFromString(strings.TrimSpace(stdout.String())) |
|
}
|
|
|