THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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
tags/v1.8.0-rc3
zeripath GitHub 7 months ago
parent
commit
245089b9c9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 19 deletions
  1. +2
    -2
      Gopkg.lock
  2. +1
    -0
      options/locale/locale_en-US.ini
  3. +8
    -4
      templates/repo/commits_table.tmpl
  4. +3
    -0
      templates/repo/pulls/compare.tmpl
  5. +11
    -2
      vendor/code.gitea.io/git/hook.go
  6. +16
    -11
      vendor/code.gitea.io/git/repo_pull.go

+ 2
- 2
Gopkg.lock View File

@@ -3,11 +3,11 @@

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

[[projects]]
branch = "master"


+ 1
- 0
options/locale/locale_en-US.ini 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.commits = Commits
commits.no_commits = No commits in common. '%s' and '%s' have entirely different histories.
commits.search = Search commits…
commits.find = Search
commits.search_all = All Branches


+ 8
- 4
templates/repo/commits_table.tmpl View File

@@ -1,9 +1,13 @@
<h4 class="ui top attached header">
<div class="ui stackable grid">
<div class="six wide column">
{{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}}
<div class="ten wide column">
{{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 class="ten wide right aligned column">
<div class="six wide right aligned column">
{{if .PageIsCommits}}
<form class="ignore-dirty" action="{{.RepoLink}}/commits/{{.BranchNameSubURL | EscapePound}}/search">
<div class="ui tiny search input">
@@ -23,7 +27,7 @@
</div>
</h4>

{{if .Commits}}
{{if and .Commits (gt .CommitCount 0)}}
<div class="ui attached table segment">
<table class="ui very basic striped fixed table single line" id="commits-table">
<thead>


+ 3
- 0
templates/repo/pulls/compare.tmpl View File

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


+ 11
- 2
vendor/code.gitea.io/git/hook.go View File

@@ -82,11 +82,20 @@ func (h *Hook) Name() string {
func (h *Hook) Update() error {
if len(strings.TrimSpace(h.Content)) == 0 {
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 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.


+ 16
- 11
vendor/code.gitea.io/git/repo_pull.go View File

@@ -48,17 +48,22 @@ func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch stri

prInfo := new(PullRequestInfo)
prInfo.MergeBase, err = repo.GetMergeBase(remoteBranch, headBranch)
if err != nil {
return nil, fmt.Errorf("GetMergeBase: %v", err)
}

logs, err := NewCommand("log", prInfo.MergeBase+"..."+headBranch, prettyLogFormat).RunInDirBytes(repo.Path)
if err != nil {
return nil, err
}
prInfo.Commits, err = repo.parsePrettyFormatLogToList(logs)
if err != nil {
return nil, fmt.Errorf("parsePrettyFormatLogToList: %v", err)
if err == nil {
// We have a common base
logs, err := NewCommand("log", prInfo.MergeBase+"..."+headBranch, prettyLogFormat).RunInDirBytes(repo.Path)
if err != nil {
return nil, err
}
prInfo.Commits, err = repo.parsePrettyFormatLogToList(logs)
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.


Loading…
Cancel
Save