You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gitea/services/pull
Viktor Kuzmin 49eb168677
Retarget depending pulls when the parent branch is deleted (#28686)
Sometimes you need to work on a feature which depends on another (unmerged) feature.
In this case, you may create a PR based on that feature instead of the main branch.
Currently, such PRs will be closed without the possibility to reopen in case the parent feature is merged and its branch is deleted.
Automatic target branch change make life a lot easier in such cases.
Github and Bitbucket behave in such way.

Example:
$PR_1$: main <- feature1
$PR_2$: feature1 <- feature2

Currently, merging $PR_1$ and deleting its branch leads to $PR_2$ being closed without the possibility to reopen.
This is both annoying and loses the review history when you open a new PR.

With this change, $PR_2$ will change its target branch to main ($PR_2$: main <- feature2) after $PR_1$ has been merged and its branch has been deleted.

This behavior is enabled by default but can be disabled.
For security reasons, this target branch change will not be executed when merging PRs targeting another repo. 

Fixes #27062
Fixes #18408

---------

Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: delvh <dev.lh@web.de>
1 year ago
..
check.go Abstract hash function usage (#28138) 1 year ago
check_test.go Replace assert.Fail with assert.FailNow (#27578) 1 year ago
comment.go Delete `issue_service.CreateComment` (#26298) 2 years ago
commit_status.go Fix pull request check list is limited (#26179) 2 years ago
edits.go Implement FSFE REUSE for golang files (#21840) 2 years ago
lfs.go Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220) 1 year ago
main_test.go make writing main test easier (#27270) 1 year ago
merge.go Abstract hash function usage (#28138) 1 year ago
merge_merge.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
merge_prepare.go Refactor merge/update git command calls (#23366) 2 years ago
merge_rebase.go Merge message template support for rebase without merge commit (#22669) 2 years ago
merge_squash.go Improve squash merge commit author and co-author with private emails (#22977) 2 years ago
merge_test.go Support template for merge message description (#22248) 2 years ago
patch.go Improve ObjectFormat interface (#28496) 1 year ago
patch_unmerged.go Implement FSFE REUSE for golang files (#21840) 2 years ago
pull.go Retarget depending pulls when the parent branch is deleted (#28686) 1 year ago
pull_test.go Support template for merge message description (#22248) 2 years ago
review.go Use db.Find instead of writing methods for every object (#28084) 1 year ago
temp_repo.go Adjust object format interface (#28469) 1 year ago
update.go Sync branches into databases (#22743) 2 years ago
update_rebase.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago