Browse Source

#3181 detect situation when base branch is deleted in pull request

tags/v1.2.0-rc1
Unknwon 9 years ago
parent
commit
2397e0dae9
4 changed files with 11 additions and 3 deletions
  1. +1
    -1
      README.md
  2. +1
    -1
      gogs.go
  3. +8
    -0
      routers/repo/pull.go
  4. +1
    -1
      templates/.VERSION

+ 1
- 1
README.md View File

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra

![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)

##### Current tip version: 0.9.50 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
##### Current tip version: 0.9.51 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)

| Web | UI | Preview |
|:-------------:|:-------:|:-------:|


+ 1
- 1
gogs.go View File

@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)

const APP_VER = "0.9.50.0723"
const APP_VER = "0.9.51.0723"

func init() {
runtime.GOMAXPROCS(runtime.NumCPU())


+ 8
- 0
routers/repo/pull.go View File

@@ -235,6 +235,14 @@ func PrepareViewPullInfo(ctx *context.Context, pull *models.Issue) *git.PullRequ
prInfo, err := headGitRepo.GetPullRequestInfo(models.RepoPath(repo.Owner.Name, repo.Name),
pull.BaseBranch, pull.HeadBranch)
if err != nil {
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
ctx.Data["IsPullReuqestBroken"] = true
ctx.Data["BaseTarget"] = "deleted"
ctx.Data["NumCommits"] = 0
ctx.Data["NumFiles"] = 0
return nil
}

ctx.Handle(500, "GetPullRequestInfo", err)
return nil
}


+ 1
- 1
templates/.VERSION View File

@@ -1 +1 @@
0.9.50.0723
0.9.51.0723

Loading…
Cancel
Save