diff options
| -rw-r--r-- | vendor/code.gitea.io/git/CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | vendor/code.gitea.io/git/MAINTAINERS | 1 | ||||
| -rw-r--r-- | vendor/code.gitea.io/git/README.md | 2 | ||||
| -rw-r--r-- | vendor/code.gitea.io/git/tree_entry.go | 7 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
5 files changed, 14 insertions, 6 deletions
diff --git a/vendor/code.gitea.io/git/CONTRIBUTING.md b/vendor/code.gitea.io/git/CONTRIBUTING.md index 3c076437cc..3ce81e0adc 100644 --- a/vendor/code.gitea.io/git/CONTRIBUTING.md +++ b/vendor/code.gitea.io/git/CONTRIBUTING.md @@ -48,13 +48,13 @@ Please use your real name, we really dislike pseudonyms or anonymous contributio ## Maintainers -To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Gitter develop channel](https://gitter.im/go-gitea/develop). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team. +To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Discord #develop channel](https://discord.gg/NsatcWJ). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team. ## Owners Since Gitea is a pure community organization without any company support, to keep the development healthy we will elect three owners every year. All contributors may vote to elect up to three candidates, one of which will be the main owner, and the other two the assistant owners. When the new owners have been elected, the old owners will give up ownership to the newly elected owners. If an owner is unable to do so, the other owners will assist in ceding ownership to the newly elected owners. -After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements on the [Gitter main channel](https://gitter.im/go-gitea/gitea). Below are the words to speak: +After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements on the [Discord #general channel](https://discord.gg/NsatcWJ). Below are the words to speak: ``` I'm honored to having been elected an owner of Gitea, I agree with [CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea and lead the development of Gitea. diff --git a/vendor/code.gitea.io/git/MAINTAINERS b/vendor/code.gitea.io/git/MAINTAINERS index bcd086da7b..fad08cddd0 100644 --- a/vendor/code.gitea.io/git/MAINTAINERS +++ b/vendor/code.gitea.io/git/MAINTAINERS @@ -14,3 +14,4 @@ Thibault Meyer <meyer.thibault@gmail.com> (@0xbaadf00d) Thomas Boerger <thomas@webhippie.de> (@tboerger) Lauris Bukšis-Haberkorns <lauris@nix.lv> (@lafriks) Antoine Girard <sapk@sapk.fr> (@sapk) +Jonas Östanbäck <jonas.ostanback@gmail.com> (@cez81) diff --git a/vendor/code.gitea.io/git/README.md b/vendor/code.gitea.io/git/README.md index 0b58e8ff97..e27603b0f2 100644 --- a/vendor/code.gitea.io/git/README.md +++ b/vendor/code.gitea.io/git/README.md @@ -1,7 +1,7 @@ # Git Shell [](http://drone.gitea.io/go-gitea/git) -[](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[](https://discord.gg/NsatcWJ) [](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") [](https://coverage.gitea.io/go-gitea/git) [](https://goreportcard.com/report/code.gitea.io/git) diff --git a/vendor/code.gitea.io/git/tree_entry.go b/vendor/code.gitea.io/git/tree_entry.go index 079dfddd63..f3b0603456 100644 --- a/vendor/code.gitea.io/git/tree_entry.go +++ b/vendor/code.gitea.io/git/tree_entry.go @@ -5,6 +5,7 @@ package git import ( + "fmt" "os" "path/filepath" "sort" @@ -254,6 +255,12 @@ func getNextCommitInfos(state *getCommitInfoState) error { if path == "" { break } + if path[0] == '"' { + path, err = strconv.Unquote(path) + if err != nil { + return fmt.Errorf("Unquote: %v", err) + } + } state.update(path) } i++ // skip blank line diff --git a/vendor/vendor.json b/vendor/vendor.json index c0fb418706..096cd3ac05 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,10 +3,10 @@ "ignore": "test appengine", "package": [ { - "checksumSHA1": "f0HMnzIIPNck4xa1ERsnZaHM8YI=", + "checksumSHA1": "LhKqkeygDmm0lohn3T4nna0HC/8=", "path": "code.gitea.io/git", - "revision": "a709880af924a8ea77e2ce7688743db69b3566a1", - "revisionTime": "2017-06-06T06:50:37Z" + "revision": "fb22c9ecdb33596b58430368900cc64c9fcdafd8", + "revisionTime": "2017-06-16T02:13:53Z" }, { "checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=", |