forgejo-aneksajo/services/pull
Matthias Riße 8a513e8bed feat: copy annexed files on pull request merge (#62)
This changes the PR merge process such that annexed files contained in the to-be-merged commits are copied from the head repository to the base repository as part of the merge, similar to how it is done for LFS files.

Fixes #11.

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

- I added test coverage for Go changes...
  - [ ] in their respective `*_test.go` for unit tests.
  - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [ ] I did not document these changes and I do not expect someone else to do it.

- [x] I do not want this change to show in the release notes.
- [ ] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

Reviewed-on: https://codeberg.org/forgejo-aneksajo/forgejo-aneksajo/pulls/62
Co-authored-by: Matthias Riße <m.risse@fz-juelich.de>
Co-committed-by: Matthias Riße <m.risse@fz-juelich.de>
2025-06-18 12:01:09 +02:00
..
annex.go feat: copy annexed files on pull request merge (#62) 2025-06-18 12:01:09 +02:00
check.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
check_test.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
comment.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
commit_status.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
commit_status_test.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
edits.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
lfs.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
main_test.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge.go feat: copy annexed files on pull request merge (#62) 2025-06-18 12:01:09 +02:00
merge_ff_only.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge_merge.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge_prepare.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge_rebase.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge_squash.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
merge_test.go Support template for merge message description (#22248) 2022-12-29 14:40:20 +02:00
patch.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
patch_unmerged.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
pull.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
pull_test.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
review.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
review_test.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
temp_repo.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
update.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00
update_rebase.go [v11.0/forgejo] chore: branding import path (#7354) 2025-03-27 20:13:05 +00:00