Skip to content

Commit 117ef1d

Browse files
committed
Add missing branches fixtures and fix a bug
1 parent 5582146 commit 117ef1d

File tree

2 files changed

+73
-1
lines changed

2 files changed

+73
-1
lines changed

models/fixtures/branch.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,75 @@
9393
is_deleted: false
9494
deleted_by_id: 0
9595
deleted_unix: 0
96+
97+
-
98+
id: 16
99+
repo_id: 1
100+
name: 'DefaultBranch'
101+
commit_id: '90c1019714259b24fb81711d4416ac0f18667dfa'
102+
commit_message: 'add license'
103+
commit_time: 1709259547
104+
pusher_id: 1
105+
is_deleted: false
106+
deleted_by_id: 0
107+
deleted_unix: 0
108+
109+
-
110+
id: 17
111+
repo_id: 1
112+
name: 'develop'
113+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
114+
commit_message: 'Initial commit'
115+
commit_time: 1489927679
116+
pusher_id: 1
117+
is_deleted: false
118+
deleted_by_id: 0
119+
deleted_unix: 0
120+
121+
-
122+
id: 18
123+
repo_id: 1
124+
name: 'feature/1'
125+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
126+
commit_message: 'Initial commit'
127+
commit_time: 1489927679
128+
pusher_id: 1
129+
is_deleted: false
130+
deleted_by_id: 0
131+
deleted_unix: 0
132+
133+
-
134+
id: 19
135+
repo_id: 1
136+
name: 'home-md-img-check'
137+
commit_id: '78fb907e3a3309eae4fe8fef030874cebbf1cd5e'
138+
commit_message: 'add test fake img'
139+
commit_time: 1677760557
140+
pusher_id: 1
141+
is_deleted: false
142+
deleted_by_id: 0
143+
deleted_unix: 0
144+
145+
-
146+
id: 20
147+
repo_id: 1
148+
name: 'pr-to-update'
149+
commit_id: '62fb502a7172d4453f0322a2cc85bddffa57f07a'
150+
commit_message: 'add WoW File'
151+
commit_time: 1579200695
152+
pusher_id: 1
153+
is_deleted: false
154+
deleted_by_id: 0
155+
deleted_unix: 0
156+
157+
-
158+
id: 21
159+
repo_id: 1
160+
name: 'sub-home-md-img-check'
161+
commit_id: '4649299398e4d39a5c09eb4f534df6f1e1eb87cc'
162+
commit_message: 'Test how READMEs render images when found in a subfolder'
163+
commit_time: 1678403550
164+
pusher_id: 1
165+
is_deleted: false
166+
deleted_by_id: 0
167+
deleted_unix: 0

routers/web/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ func GetUniquePatchBranchName(ctx *context.Context) string {
853853
for i := 1; i <= 1000; i++ {
854854
branchName := fmt.Sprintf("%s%d", prefix, i)
855855
if _, err := git_model.GetNonDeletedBranch(ctx, ctx.Repo.Repository.ID, branchName); err != nil {
856-
if git.IsErrBranchNotExist(err) {
856+
if git_model.IsErrBranchNotExist(err) {
857857
return branchName
858858
}
859859
log.Error("GetUniquePatchBranchName: %v", err)

0 commit comments

Comments
 (0)