aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git/repo_tree.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-05-11 16:29:17 +0100
committertechknowlogick <hello@techknowlogick.com>2019-05-11 11:29:17 -0400
commitce8de3533485eed0c56059d6334a5031a73eed67 (patch)
tree2f8e5c84441467269a98fb450ddfaca236cfc2e7 /modules/git/repo_tree.go
parent34eee25bd42d19287e3e33afd169cc979ab61f37 (diff)
downloadgitea-ce8de3533485eed0c56059d6334a5031a73eed67.tar.gz
gitea-ce8de3533485eed0c56059d6334a5031a73eed67.zip
Remove local clones & make hooks run on merge/edit/upload (#6672)
* Add options to git.Clone to make it more capable * Begin the process of removing the local copy and tidy up * Remove Wiki LocalCopy Checkouts * Remove the last LocalRepo helpers * Remove WithTemporaryFile * Enable push-hooks for these routes * Ensure tests cope with hooks Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove Repository.LocalCopyPath() * Move temporary repo to use the standard temporary path * Fix the tests Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove LocalWikiPath * Fix missing remove Signed-off-by: Andrew Thornton <art27@cantab.net> * Use AppURL for Oauth user link (#6894) * Use AppURL for Oauth user link Fix #6843 * Update oauth.go * Update oauth.go * internal/ssh: ignore env command totally (#6825) * ssh: ignore env command totally * Remove commented code Needed fix described in issue #6889 * Escape the commit message on issues update and title in telegram hook (#6901) * update sdk to latest (#6903) * improve description of branch protection (fix #6886) (#6906) The branch protection description text were not quite accurate. * Fix logging documentation (#6904) * ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG * Allow DISABLE_ROUTER_LOG to be set in the [log] section * [skip ci] Updated translations via Crowdin * Move sdk structs to modules/structs (#6905) * move sdk structs to moduels/structs * fix tests * fix fmt * fix swagger * fix vendor
Diffstat (limited to 'modules/git/repo_tree.go')
-rw-r--r--modules/git/repo_tree.go50
1 files changed, 50 insertions, 0 deletions
diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go
index 8bb7291744..7d32d3685c 100644
--- a/modules/git/repo_tree.go
+++ b/modules/git/repo_tree.go
@@ -6,6 +6,11 @@
package git
import (
+ "fmt"
+ "os"
+ "strings"
+ "time"
+
"gopkg.in/src-d/go-git.v4/plumbing"
)
@@ -47,3 +52,48 @@ func (repo *Repository) GetTree(idStr string) (*Tree, error) {
treeObject.ResolvedID = resolvedID
return treeObject, nil
}
+
+// CommitTreeOpts represents the possible options to CommitTree
+type CommitTreeOpts struct {
+ Parents []string
+ Message string
+ KeyID string
+ NoGPGSign bool
+}
+
+// CommitTree creates a commit from a given tree id for the user with provided message
+func (repo *Repository) CommitTree(sig *Signature, tree *Tree, opts CommitTreeOpts) (SHA1, error) {
+ commitTimeStr := time.Now().Format(time.UnixDate)
+
+ // Because this may call hooks we should pass in the environment
+ env := append(os.Environ(),
+ "GIT_AUTHOR_NAME="+sig.Name,
+ "GIT_AUTHOR_EMAIL="+sig.Email,
+ "GIT_AUTHOR_DATE="+commitTimeStr,
+ "GIT_COMMITTER_NAME="+sig.Name,
+ "GIT_COMMITTER_EMAIL="+sig.Email,
+ "GIT_COMMITTER_DATE="+commitTimeStr,
+ )
+ cmd := NewCommand("commit-tree", tree.ID.String())
+
+ for _, parent := range opts.Parents {
+ cmd.AddArguments("-p", parent)
+ }
+
+ cmd.AddArguments("-m", opts.Message)
+
+ if opts.KeyID != "" {
+ cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID))
+ }
+
+ if opts.NoGPGSign {
+ cmd.AddArguments("--no-gpg-sign")
+ }
+
+ res, err := cmd.RunInDirWithEnv(repo.Path, env)
+
+ if err != nil {
+ return SHA1{}, err
+ }
+ return NewIDFromString(strings.TrimSpace(res))
+}