Skip to content

Commit c18b98c

Browse files
committed
don't increment fork acount for reparented fork
it's already set
1 parent 24c91d8 commit c18b98c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

services/repository/fork.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
115115
if err = repo_model.ReparentFork(ctx, repo.ID, opts.BaseRepo.ID); err != nil {
116116
return err
117117
}
118-
if err = repo_model.IncrementRepoForkNum(ctx, repo.ID); err != nil {
119-
return err
120-
}
121118
} else {
122119
if err = repo_model.IncrementRepoForkNum(ctx, opts.BaseRepo.ID); err != nil {
123120
return err

tests/integration/repo_fork_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ func TestAPICreateForkWithReparent(t *testing.T) {
163163
assert.False(t, forked.IsFork)
164164
assert.Equal(t, forked.ID, orig.ForkID)
165165
assert.True(t, orig.IsFork)
166+
assert.Equal(t, 1, forked.NumForks)
167+
assert.Equal(t, 0, orig.NumForks)
166168
}
167169

168170
func TestAPICreateForkWithoutReparent(t *testing.T) {
@@ -194,4 +196,6 @@ func TestAPICreateForkWithoutReparent(t *testing.T) {
194196
assert.True(t, forked.IsFork)
195197
assert.Equal(t, int64(0), orig.ForkID)
196198
assert.False(t, orig.IsFork)
199+
assert.Equal(t, 0, forked.NumForks)
200+
assert.Equal(t, 1, orig.NumForks)
197201
}

0 commit comments

Comments
 (0)