diff options
| author | Ethan Koenig <etk39@cornell.edu> | 2017-05-30 05:32:01 -0400 |
|---|---|---|
| committer | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-05-30 04:32:01 -0500 |
| commit | 474d6367946c661ea4b8a6b8b25fab1b5bec15d2 (patch) | |
| tree | ae284947e02ce992552b863fe20519be10a1f227 /vendor/code.gitea.io/git/command.go | |
| parent | 367ff327edc6d2865e32d6e8c6fbdd216c4ab730 (diff) | |
| download | gitea-474d6367946c661ea4b8a6b8b25fab1b5bec15d2.tar.gz gitea-474d6367946c661ea4b8a6b8b25fab1b5bec15d2.zip | |
Update code.gitea.io/git (#1824)
* Update code.gitea.io/git
* Update function calls
* govendor fetch
Diffstat (limited to 'vendor/code.gitea.io/git/command.go')
| -rw-r--r-- | vendor/code.gitea.io/git/command.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/code.gitea.io/git/command.go b/vendor/code.gitea.io/git/command.go index c3534a1456..06722c213b 100644 --- a/vendor/code.gitea.io/git/command.go +++ b/vendor/code.gitea.io/git/command.go @@ -70,7 +70,11 @@ func (c *Command) RunInDirTimeoutPipeline(timeout time.Duration, dir string, std return err } - return cmd.Wait() + if err := cmd.Wait(); err != nil { + return err + } + + return ctx.Err() } // RunInDirTimeout executes the command in given directory with given timeout, |