mirror of
https://codeberg.org/forgejo/forgejo
synced 2025-10-18 22:40:38 +02:00
b9a934f5dc
This change is very similar to what was done in forgejo/forgejo#7727. When a PR is updated, `checkIfPRContentChanged` is called to check if the diff changed - this is done on a temporary repository. This change improves this checking by doing this operation on the bare repository. The change is split into several commits.
The following changes were made (in this exact order)
1. Update the `getTestPatchCtx` function that was introduced in forgejo/forgejo#7727 so it can be used outside the context of conflict checking. This is a simple change by making the caller determine if it can use a bare repository or not.
2. Do a small refactor of `ValidatePullRequest` to avoid indentation hell in this function, this is purely a refactor but necessary to not blow my brain while working on this function.
3. The first enhancement, introduce `testPatchCtx` in `ValidatePullRequest` to get diverging commits via the bare repository.
4. The main enhancement, do a refactor to move the function to be part of the repository struct and do a rename as this fits as a general purpose function. This refactoring includes it no longer being specific to a temporary repository and works on a bare repository.
5. Add extensive units tests, integration tests are added in forgejo/forgejo#8450 it checks that both calls to `CheckIfDiffDiffers` work. Because it also fixes a bug I sent it as a different PR.
6. Extend the integration test to check for diffs with commits from different repositories, to demonstrate that `getTestPatchCtx` works (specifically the `env` variable).
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8451
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| foreachref | ||
| internal | ||
| pipeline | ||
| pushoptions | ||
| tests/repos | ||
| url | ||
| batch.go | ||
| batch_reader.go | ||
| blame.go | ||
| blame_sha256_test.go | ||
| blame_test.go | ||
| blob.go | ||
| blob_test.go | ||
| command.go | ||
| command_race_test.go | ||
| command_test.go | ||
| commit.go | ||
| commit_info.go | ||
| commit_info_test.go | ||
| commit_reader.go | ||
| commit_sha256_test.go | ||
| commit_test.go | ||
| diff.go | ||
| diff_compare.go | ||
| diff_compare_test.go | ||
| diff_test.go | ||
| error.go | ||
| git.go | ||
| git_test.go | ||
| grep.go | ||
| grep_test.go | ||
| hook.go | ||
| last_commit_cache.go | ||
| log_name_status.go | ||
| notes.go | ||
| notes_test.go | ||
| object_format.go | ||
| object_id.go | ||
| object_id_test.go | ||
| object_signature.go | ||
| parse.go | ||
| parse_test.go | ||
| README.md | ||
| ref.go | ||
| ref_test.go | ||
| remote.go | ||
| repo.go | ||
| repo_archive.go | ||
| repo_attribute.go | ||
| repo_attribute_test.go | ||
| repo_base.go | ||
| repo_base_test.go | ||
| repo_blame.go | ||
| repo_blob_test.go | ||
| repo_branch.go | ||
| repo_branch_test.go | ||
| repo_commit.go | ||
| repo_commit_test.go | ||
| repo_commitgraph.go | ||
| repo_compare.go | ||
| repo_compare_test.go | ||
| repo_gpg.go | ||
| repo_hook.go | ||
| repo_index.go | ||
| repo_language_stats.go | ||
| repo_language_stats_test.go | ||
| repo_object.go | ||
| repo_ref.go | ||
| repo_ref_test.go | ||
| repo_stats.go | ||
| repo_stats_test.go | ||
| repo_tag.go | ||
| repo_tag_test.go | ||
| repo_test.go | ||
| repo_tree.go | ||
| signature.go | ||
| signature_test.go | ||
| submodule.go | ||
| submodule_test.go | ||
| tag.go | ||
| tag_test.go | ||
| tree.go | ||
| tree_blob.go | ||
| tree_entry.go | ||
| tree_entry_mode.go | ||
| tree_test.go | ||
| utils.go | ||
| utils_test.go | ||
Git Module
This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request.