diff options
| author | Kyle D <kdumontnu@gmail.com> | 2023-02-19 20:56:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 11:56:07 +0800 |
| commit | 2b3f12f6fd12afebb3b8397dc612621df6c730e2 (patch) | |
| tree | 427e05fe61548413bac83ddde088f368e8f967e7 /models | |
| parent | 6840a8ccfcdbdcc352eac40a5c9beabf6e7c54ff (diff) | |
| download | gitea-2b3f12f6fd12afebb3b8397dc612621df6c730e2.tar.gz gitea-2b3f12f6fd12afebb3b8397dc612621df6c730e2.zip | |
Use beforeCommit instead of baseCommit (#22949)
Replaces: https://github.com/go-gitea/gitea/pull/22947
Fixes https://github.com/go-gitea/gitea/issues/22946
Probably related to https://github.com/go-gitea/gitea/issues/19530
Basically, many of the diffs were broken because they were comparing to
the base commit, where a 3-dot diff should be comparing to the [last
common
ancestor](https://matthew-brett.github.io/pydagogue/git_diff_dots.html).
This should have an integration test so that we don’t run into this
issue again.
---------
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/db/iterate_test.go | 2 | ||||
| -rw-r--r-- | models/fixtures/repo_unit.yml | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 63487afa49..a713fe0d8b 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -25,7 +25,7 @@ func TestIterate(t *testing.T) { return nil }) assert.NoError(t, err) - assert.EqualValues(t, 81, repoCnt) + assert.EqualValues(t, 83, repoCnt) err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repoUnit *repo_model.RepoUnit) error { reopUnit2 := repo_model.RepoUnit{ID: repoUnit.ID} diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index 8706717ad4..503b8c9ddf 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -556,3 +556,16 @@ repo_id: 54 type: 1 created_unix: 946684810 + +- + id: 82 + repo_id: 31 + type: 1 + created_unix: 946684810 + +- + id: 83 + repo_id: 31 + type: 3 + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}" + created_unix: 946684810 |