From c18b98cf3f869ae8b3f16886d828cca9db0e3cc8 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 8 Sep 2025 13:43:08 +0200 Subject: [PATCH] don't increment fork acount for reparented fork it's already set --- services/repository/fork.go | 3 --- tests/integration/repo_fork_test.go | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/repository/fork.go b/services/repository/fork.go index 4a80015e58..3f487563a8 100644 --- a/services/repository/fork.go +++ b/services/repository/fork.go @@ -115,9 +115,6 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork if err = repo_model.ReparentFork(ctx, repo.ID, opts.BaseRepo.ID); err != nil { return err } - if err = repo_model.IncrementRepoForkNum(ctx, repo.ID); err != nil { - return err - } } else { if err = repo_model.IncrementRepoForkNum(ctx, opts.BaseRepo.ID); err != nil { return err diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index 1ad73ca44d..40ca199689 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -163,6 +163,8 @@ func TestAPICreateForkWithReparent(t *testing.T) { assert.False(t, forked.IsFork) assert.Equal(t, forked.ID, orig.ForkID) assert.True(t, orig.IsFork) + assert.Equal(t, 1, forked.NumForks) + assert.Equal(t, 0, orig.NumForks) } func TestAPICreateForkWithoutReparent(t *testing.T) { @@ -194,4 +196,6 @@ func TestAPICreateForkWithoutReparent(t *testing.T) { assert.True(t, forked.IsFork) assert.Equal(t, int64(0), orig.ForkID) assert.False(t, orig.IsFork) + assert.Equal(t, 0, forked.NumForks) + assert.Equal(t, 1, orig.NumForks) }