Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix protected branch files detection on pre_receive hook #31778

Merged
merged 5 commits into from
Aug 6, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Aug 4, 2024

Fix #31738

When pushing a new branch, the old commit is zero. Most git commands cannot recognize the zero commit id. To get the changed files in the push, we need to get the first diverge commit of this branch. In most situations, we could check commits one by one until one commit is contained by another branch. Then we will think that commit is the diverge point.

And in a pre-receive hook, this will be more difficult because all commits haven't been merged and they actually stored in a temporary place by git. So we need to bring some envs to let git know the commit exist.

@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Aug 4, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 4, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 4, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Aug 4, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 5, 2024
@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 6, 2024
@wolfogre wolfogre enabled auto-merge (squash) August 6, 2024 02:45
@wolfogre wolfogre disabled auto-merge August 6, 2024 02:45
@wolfogre wolfogre added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 6, 2024
@wolfogre wolfogre enabled auto-merge (squash) August 6, 2024 02:52
@lunny
Copy link
Member Author

lunny commented Aug 6, 2024

Make L-G-T-M bot work

@wolfogre wolfogre merged commit df7f1c2 into go-gitea:main Aug 6, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Aug 6, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 6, 2024
@lunny lunny deleted the lunny/fix_protected_branch_file branch August 6, 2024 16:11
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 7, 2024
* giteaofficial/main:
  Fix protected branch files detection on pre_receive hook (go-gitea#31778)
  Add signature support for the RPM module (go-gitea#27069)
  Fix null requested_reviewer from API (go-gitea#31773)
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Aug 7, 2024
)

Fix go-gitea#31738

When pushing a new branch, the old commit is zero. Most git commands
cannot recognize the zero commit id. To get the changed files in the
push, we need to get the first diverge commit of this branch. In most
situations, we could check commits one by one until one commit is
contained by another branch. Then we will think that commit is the
diverge point.

And in a pre-receive hook, this will be more difficult because all
commits haven't been merged and they actually stored in a temporary
place by git. So we need to bring some envs to let git know the commit
exist.
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Aug 7, 2024
silverwind pushed a commit that referenced this pull request Aug 8, 2024
…1796)

Backport #31778 by @lunny

Fix #31738

When pushing a new branch, the old commit is zero. Most git commands
cannot recognize the zero commit id. To get the changed files in the
push, we need to get the first diverge commit of this branch. In most
situations, we could check commits one by one until one commit is
contained by another branch. Then we will think that commit is the
diverge point.

And in a pre-receive hook, this will be more difficult because all
commits haven't been merged and they actually stored in a temporary
place by git. So we need to bring some envs to let git know the commit
exist.

Co-authored-by: Lunny Xiao <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Internal Server Error on push (GetAffectedFiles())
4 participants