Skip to content

Commit 3328679

Browse files
committed
Fix test
1 parent d08942e commit 3328679

File tree

3 files changed

+221
-93
lines changed

3 files changed

+221
-93
lines changed

models/fixtures/branch.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,41 @@
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+
107+
-
108+
id: 17
109+
repo_id: 1
110+
name: 'develop'
111+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
112+
commit_message: 'first commit'
113+
commit_time: 978307100
114+
pusher_id: 1
115+
116+
-
117+
id: 18
118+
repo_id: 11
119+
name: 'develop'
120+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
121+
commit_message: 'Initial commit'
122+
commit_time: 1489956479
123+
pusher_id: 1
124+
125+
-
126+
id: 19
127+
repo_id: 10
128+
name: 'DefaultBranch'
129+
commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
130+
commit_message: 'Initial commit'
131+
commit_time: 1489956479
132+
pusher_id: 1
133+
is_deleted: false

routers/common/compare.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func findHeadRepoFromRootBase(ctx context.Context, baseRepo *repo_model.Reposito
169169
return nil, nil
170170
}
171171
// test if we are lucky
172-
repo, err := repo_model.GetUserFork(ctx, headUserID, baseRepo.ID)
172+
repo, err := repo_model.GetUserFork(ctx, baseRepo.ID, headUserID)
173173
if err != nil {
174174
return nil, err
175175
}

0 commit comments

Comments
 (0)