mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-08 15:47:40 +00:00
7c150be23d
Some checks are pending
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
- `testPatch` is a function that is called to test a pull request and determine the state of the pull request. Checking for merge conflicts, check if the diff is empty and if the pull request modifies any protected files. - The checking for merge conflict and if the diff is empty used git commands that relied on a working tree to correctly functions. Forgejo store repositories in a bare format which do not contain a working tree. This means that a temporary copy was created every time a pull request had to be re-checked and for large repositories involving quite some I/O interaction. - This patch adjusts those codepaths to instead use newer Git plumbing commands that work without requiring a work tree and can thus be used directly on the bare repository. The merge conflict is now done via [`git-merge-tree(1)`](https://git-scm.com/docs/git-merge-tree/) and checking if the diff is empty is done via [`git-diff-tree(1)`](https://git-scm.com/docs/git-diff-tree). - If the function is called to test a patch where the head and base repository are not the same, then [Git alternate](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefalternateobjectdatabaseaalternateobjectdatabase) is used to make the head commit available in the base repository, this done on a per git command basis via the `GIT_ALTERNATE_OBJECT_DIRECTORIES` environment. - As far as I can understand the documentation and the existing code, there's no edge case that the new code cannot handle. It also results in a cleaner codepath, as the existing code did a lot of checking and merging in a more traditional approach that required a lot of (parsing) code, while the new code offloads this to git and has a trivial parser of the output. - Resolves forgejo/forgejo#7701 - Added exhaustive integration testing. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7727 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz> |
||
|---|---|---|
| .. | ||
| 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_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.