1
0
Fork 0
forgejo/modules/repository
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.
2023-03-09 12:14:22 -06:00
..
collaborator.go Always reuse transaction (#22362) 2023-01-08 09:34:58 +08:00
collaborator_test.go Rename repo.GetOwner to repo.LoadOwner (#22967) 2023-02-18 20:11:03 +08:00
commits.go Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
commits_test.go Avoid warning for system setting when start up (#23054) 2023-02-24 18:23:13 +08:00
create.go Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
create_test.go Map OIDC groups to Orgs/Teams (#21441) 2023-02-08 14:44:42 +08:00
delete.go Rename repo.GetOwner to repo.LoadOwner (#22967) 2023-02-18 20:11:03 +08:00
env.go Implement actions (#21937) 2023-01-31 09:45:19 +08:00
fork.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
generate.go Repositories: by default disable all units except code and pulls on forks (#22541) 2023-02-04 14:48:38 +08:00
generate_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
hooks.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
init.go Reduce duplicate and useless code in options (#23369) 2023-03-08 17:31:27 +08:00
main_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
push.go Fix pull request update showing too many commits with multiple branches (#22856) 2023-03-09 12:14:22 -06:00
repo.go Add context cache as a request level cache (#22294) 2023-02-15 21:37:34 +08:00
temp.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00