Fix bug

Author: lunny

models/fixtures/branch.yml

@@ -164,4 +164,4 @@
   pusher_id: 1
   is_deleted: false
   deleted_by_id: 0
-  deleted_unix: 0
+  deleted_unix: 0

routers/api/v1/repo/branch.go

@@ -60,7 +60,7 @@ func GetBranch(ctx *context.APIContext) {
 
 	branch, err := git_model.GetNonDeletedBranch(ctx, ctx.Repo.Repository.ID, branchName)
 	if err != nil {
-		if git.IsErrBranchNotExist(err) {
+		if git_model.IsErrBranchNotExist(err) {
 			ctx.NotFound(err)
 		} else {
 			ctx.Error(http.StatusInternalServerError, "GetBranch", err)
@@ -261,7 +261,11 @@ func CreateBranch(ctx *context.APIContext) {
 
 	branch, err := git_model.GetNonDeletedBranch(ctx, ctx.Repo.Repository.ID, opt.BranchName)
 	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "GetBranch", err)
+		if git_model.IsErrBranchNotExist(err) {
+			ctx.NotFound(err)
+		} else {
+			ctx.Error(http.StatusInternalServerError, "GetBranch", err)
+		}
 		return
 	}
 

services/convert/pull.go

@@ -142,7 +142,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 	defer gitRepo.Close()
 
 	baseBranch, err := git_model.GetNonDeletedBranch(ctx, pr.BaseRepoID, pr.BaseBranch)
-	if err != nil && !git.IsErrBranchNotExist(err) {
+	if err != nil && !git_model.IsErrBranchNotExist(err) {
 		log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
 		return nil
 	}
@@ -195,7 +195,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		defer headGitRepo.Close()
 
 		headBranch, err := git_model.GetNonDeletedBranch(ctx, pr.HeadRepoID, pr.HeadBranch)
-		if err != nil && !git.IsErrBranchNotExist(err) {
+		if err != nil && !git_model.IsErrBranchNotExist(err) {
 			log.Error("GetBranch[%s]: %v", pr.HeadBranch, err)
 			return nil
 		}

services/repository/files/patch.go

@@ -75,7 +75,7 @@ func (opts *ApplyDiffPatchOptions) Validate(ctx context.Context, repo *repo_mode
 				BranchName: opts.NewBranch,
 			}
 		}
-		if err != nil && !git.IsErrBranchNotExist(err) {
+		if err != nil && !git_model.IsErrBranchNotExist(err) {
 			return err
 		}
 	} else {

services/repository/files/update.go

@@ -151,7 +151,7 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 				BranchName: opts.NewBranch,
 			}
 		}
-		if err != nil && !git.IsErrBranchNotExist(err) {
+		if err != nil && !git_model.IsErrBranchNotExist(err) {
 			return nil, err
 		}
 	} else if err := VerifyBranchProtection(ctx, repo, doer, opts.OldBranch, treePaths); err != nil {