From 117ef1dc4642d4540594534160da1642b99bd6b8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 29 Dec 2024 12:00:47 -0800 Subject: [PATCH] Add missing branches fixtures and fix a bug --- models/fixtures/branch.yml | 72 ++++++++++++++++++++++++++++++++++++++ routers/web/repo/editor.go | 2 +- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/models/fixtures/branch.yml b/models/fixtures/branch.yml index 17b1869ab6..aac5b75611 100644 --- a/models/fixtures/branch.yml +++ b/models/fixtures/branch.yml @@ -93,3 +93,75 @@ is_deleted: false deleted_by_id: 0 deleted_unix: 0 + +- + id: 16 + repo_id: 1 + name: 'DefaultBranch' + commit_id: '90c1019714259b24fb81711d4416ac0f18667dfa' + commit_message: 'add license' + commit_time: 1709259547 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 + +- + id: 17 + repo_id: 1 + name: 'develop' + commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d' + commit_message: 'Initial commit' + commit_time: 1489927679 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 + +- + id: 18 + repo_id: 1 + name: 'feature/1' + commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d' + commit_message: 'Initial commit' + commit_time: 1489927679 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 + +- + id: 19 + repo_id: 1 + name: 'home-md-img-check' + commit_id: '78fb907e3a3309eae4fe8fef030874cebbf1cd5e' + commit_message: 'add test fake img' + commit_time: 1677760557 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 + +- + id: 20 + repo_id: 1 + name: 'pr-to-update' + commit_id: '62fb502a7172d4453f0322a2cc85bddffa57f07a' + commit_message: 'add WoW File' + commit_time: 1579200695 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 + +- + id: 21 + repo_id: 1 + name: 'sub-home-md-img-check' + commit_id: '4649299398e4d39a5c09eb4f534df6f1e1eb87cc' + commit_message: 'Test how READMEs render images when found in a subfolder' + commit_time: 1678403550 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 \ No newline at end of file diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index aea360b202..b15628cb72 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -853,7 +853,7 @@ func GetUniquePatchBranchName(ctx *context.Context) string { for i := 1; i <= 1000; i++ { branchName := fmt.Sprintf("%s%d", prefix, i) if _, err := git_model.GetNonDeletedBranch(ctx, ctx.Repo.Repository.ID, branchName); err != nil { - if git.IsErrBranchNotExist(err) { + if git_model.IsErrBranchNotExist(err) { return branchName } log.Error("GetUniquePatchBranchName: %v", err)