diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-02-23 11:40:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 11:40:44 +0800 |
| commit | 0e6b9ea786a77a4df4aa9fff1b96b9483bcdded5 (patch) | |
| tree | 83ce2a577016f3a6fd478cce8e384f9b3118f3f6 /vendor | |
| parent | 4f3880ff151fcbda019a1a9467bc39da621fbe07 (diff) | |
| download | gitea-0e6b9ea786a77a4df4aa9fff1b96b9483bcdded5.tar.gz gitea-0e6b9ea786a77a4df4aa9fff1b96b9483bcdded5.zip | |
Take back control of hooks (#1006)
* git: delegate all server-side Git hooks (#1623)
* create hooks directories
* take control hooks back
* fix lint
* bug fixed and minor changes
* fix imports style
* fix migration scripts
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/code.gitea.io/git/hook.go | 10 | ||||
| -rw-r--r-- | vendor/code.gitea.io/git/repo_blame.go | 10 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
3 files changed, 19 insertions, 7 deletions
diff --git a/vendor/code.gitea.io/git/hook.go b/vendor/code.gitea.io/git/hook.go index d8069b6b82..afed623e6e 100644 --- a/vendor/code.gitea.io/git/hook.go +++ b/vendor/code.gitea.io/git/hook.go @@ -9,6 +9,7 @@ import ( "io/ioutil" "os" "path" + "path/filepath" "strings" "github.com/Unknwon/com" @@ -17,7 +18,7 @@ import ( // hookNames is a list of Git server hooks' name that are supported. var hookNames = []string{ "pre-receive", - // "update", + "update", "post-receive", } @@ -52,8 +53,9 @@ func GetHook(repoPath, name string) (*Hook, error) { } h := &Hook{ name: name, - path: path.Join(repoPath, "hooks", name), + path: path.Join(repoPath, "hooks", name+".d", name), } + samplePath := filepath.Join(repoPath, "hooks", name+".sample") if isFile(h.path) { data, err := ioutil.ReadFile(h.path) if err != nil { @@ -61,8 +63,8 @@ func GetHook(repoPath, name string) (*Hook, error) { } h.IsActive = true h.Content = string(data) - } else if isFile(h.path + ".sample") { - data, err := ioutil.ReadFile(h.path + ".sample") + } else if isFile(samplePath) { + data, err := ioutil.ReadFile(samplePath) if err != nil { return nil, err } diff --git a/vendor/code.gitea.io/git/repo_blame.go b/vendor/code.gitea.io/git/repo_blame.go new file mode 100644 index 0000000000..b48cbeea6c --- /dev/null +++ b/vendor/code.gitea.io/git/repo_blame.go @@ -0,0 +1,10 @@ +// Copyright 2017 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 + +// FileBlame return the Blame object of file +func (repo *Repository) FileBlame(revision, path, file string) ([]byte, error) { + return NewCommand("blame", "--root", file).RunInDirBytes(path) +} diff --git a/vendor/vendor.json b/vendor/vendor.json index 49dcec8c45..3a4ebc5780 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test", "package": [ { - "checksumSHA1": "km1AOUs34DCwgXT55fh6PrkPdiU=", + "checksumSHA1": "nt2y/SNJe3Rl0tzdaEyGQfCc4L4=", "path": "code.gitea.io/git", - "revision": "dd951bf625ebf5c16ef403f681aaec6c34324bca", - "revisionTime": "2017-02-05T02:50:57Z" + "revision": "b4c06a53d0f619e84a99eb042184663d4ad8a32b", + "revisionTime": "2017-02-22T02:52:05Z" }, { "checksumSHA1": "BKj0haFTDebzdC2nACpoGzp3s8A=", |