Prevent server 500 on compare branches with no common history (#6555) (#6558)

* Prevent server 500 on compare branches with no common history (#6555)
* Update code.gitea.io/git module
This commit is contained in:
zeripath 2019-04-11 21:31:17 +01:00 committed by GitHub
parent 2551660f49
commit 245089b9c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 19 deletions

4
Gopkg.lock generated
View File

@ -3,11 +3,11 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:e1fa64238b0a2dbf1edf98c4af8d1b8cb65179e286d7f28006b50fa9f508ee9d" digest = "1:c298eea5ff7f6ab40cda6fe75d2224e2dd271941abe2f66276063b39e43e5687"
name = "code.gitea.io/git" name = "code.gitea.io/git"
packages = ["."] packages = ["."]
pruneopts = "NUT" pruneopts = "NUT"
revision = "74d7c14dd4a3ed9c5def0dc3c1aeede399ddc5c5" revision = "63b74d438b29bb272fa9b4010abe3f50a832e7ef"
[[projects]] [[projects]]
branch = "master" branch = "master"

View File

@ -683,6 +683,7 @@ editor.cannot_commit_to_protected_branch = Cannot commit to protected branch '%s
commits.desc = Browse source code change history. commits.desc = Browse source code change history.
commits.commits = Commits commits.commits = Commits
commits.no_commits = No commits in common. '%s' and '%s' have entirely different histories.
commits.search = Search commits… commits.search = Search commits…
commits.find = Search commits.find = Search
commits.search_all = All Branches commits.search_all = All Branches

View File

@ -1,9 +1,13 @@
<h4 class="ui top attached header"> <h4 class="ui top attached header">
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="six wide column"> <div class="ten wide column">
{{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}} {{if or .PageIsCommits (gt .CommitCount 0)}}
{{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}}
{{else}}
{{.i18n.Tr "repo.commits.no_commits" $.BaseBranch $.HeadBranch }} {{if .Branch}}({{.Branch}}){{end}}
{{end}}
</div> </div>
<div class="ten wide right aligned column"> <div class="six wide right aligned column">
{{if .PageIsCommits}} {{if .PageIsCommits}}
<form class="ignore-dirty" action="{{.RepoLink}}/commits/{{.BranchNameSubURL | EscapePound}}/search"> <form class="ignore-dirty" action="{{.RepoLink}}/commits/{{.BranchNameSubURL | EscapePound}}/search">
<div class="ui tiny search input"> <div class="ui tiny search input">
@ -23,7 +27,7 @@
</div> </div>
</h4> </h4>
{{if .Commits}} {{if and .Commits (gt .CommitCount 0)}}
<div class="ui attached table segment"> <div class="ui attached table segment">
<table class="ui very basic striped fixed table single line" id="commits-table"> <table class="ui very basic striped fixed table single line" id="commits-table">
<thead> <thead>

View File

@ -54,6 +54,9 @@
<div class="ui segment"> <div class="ui segment">
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}}
</div> </div>
{{else if eq .CommitCount 0 }}
{{template "repo/commits_table" .}}
{{template "repo/diff/box" .}}
{{else}} {{else}}
{{template "repo/issue/new_form" .}} {{template "repo/issue/new_form" .}}
{{template "repo/commits_table" .}} {{template "repo/commits_table" .}}

13
vendor/code.gitea.io/git/hook.go generated vendored
View File

@ -82,11 +82,20 @@ func (h *Hook) Name() string {
func (h *Hook) Update() error { func (h *Hook) Update() error {
if len(strings.TrimSpace(h.Content)) == 0 { if len(strings.TrimSpace(h.Content)) == 0 {
if isExist(h.path) { if isExist(h.path) {
return os.Remove(h.path) err := os.Remove(h.path)
if err != nil {
return err
}
} }
h.IsActive = false
return nil return nil
} }
return ioutil.WriteFile(h.path, []byte(strings.Replace(h.Content, "\r", "", -1)), os.ModePerm) err := ioutil.WriteFile(h.path, []byte(strings.Replace(h.Content, "\r", "", -1)), os.ModePerm)
if err != nil {
return err
}
h.IsActive = true
return nil
} }
// ListHooks returns a list of Git hooks of given repository. // ListHooks returns a list of Git hooks of given repository.

View File

@ -48,17 +48,22 @@ func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch stri
prInfo := new(PullRequestInfo) prInfo := new(PullRequestInfo)
prInfo.MergeBase, err = repo.GetMergeBase(remoteBranch, headBranch) prInfo.MergeBase, err = repo.GetMergeBase(remoteBranch, headBranch)
if err != nil { if err == nil {
return nil, fmt.Errorf("GetMergeBase: %v", err) // We have a common base
} logs, err := NewCommand("log", prInfo.MergeBase+"..."+headBranch, prettyLogFormat).RunInDirBytes(repo.Path)
if err != nil {
logs, err := NewCommand("log", prInfo.MergeBase+"..."+headBranch, prettyLogFormat).RunInDirBytes(repo.Path) return nil, err
if err != nil { }
return nil, err prInfo.Commits, err = repo.parsePrettyFormatLogToList(logs)
} if err != nil {
prInfo.Commits, err = repo.parsePrettyFormatLogToList(logs) return nil, fmt.Errorf("parsePrettyFormatLogToList: %v", err)
if err != nil { }
return nil, fmt.Errorf("parsePrettyFormatLogToList: %v", err) } else {
prInfo.Commits = list.New()
prInfo.MergeBase, err = GetFullCommitID(repo.Path, remoteBranch)
if err != nil {
prInfo.MergeBase = remoteBranch
}
} }
// Count number of changed files. // Count number of changed files.