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
Brecht Van Lommel 8bdc0acf97
Fix pull request update showing too many commits with multiple branches (#22856)
When the base repository contains multiple branches with the same
commits as the base branch, pull requests can show a long list of
commits already in the base branch as having been added.

What this is supposed to do is exclude commits already in the base
branch. But the mechansim to do so assumed a commit only exists in a
single branch. Now use `git rev-list A B --not branchName` instead of
filtering commits afterwards.

The logic to detect if there was a force push also was wrong for
multiple branches. If the old commit existed in any branch in the base
repository it would assume there was no force push. Instead check if the
old commit is an ancestor of the new commit.
2 years ago
..
check.go Add force_merge to merge request and fix checking mergable (#23010) 2 years ago
check_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
comment.go Fix pull request update showing too many commits with multiple branches (#22856) 2 years ago
commit_status.go Supports wildcard protected branch (#20825) 2 years ago
edits.go Implement FSFE REUSE for golang files (#21840) 2 years ago
lfs.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
main_test.go Implement FSFE REUSE for golang files (#21840) 2 years ago
merge.go Refactor merge/update git command calls (#23366) 2 years 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 Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
merge_squash.go Refactor merge/update git command calls (#23366) 2 years ago
merge_test.go Support template for merge message description (#22248) 2 years ago
patch.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
patch_unmerged.go Implement FSFE REUSE for golang files (#21840) 2 years ago
pull.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
pull_test.go Support template for merge message description (#22248) 2 years ago
review.go Make Ctrl+Enter submit a pending comment (starting review) instead of submitting a single comment (#23245) 2 years ago
temp_repo.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
update.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago
update_rebase.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago