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.

Sign up for GitHub

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

Jump to bottom

Always write proc-receive hook for all git versions #29287

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Always write proc-receive hook for all git versions #29287

merged 2 commits into from
Feb 21, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Feb 21, 2024 •
edited
Loading

Before: only write the git hook for git >= 2.29

  • When a user upgrades git from git < 2.29 to git >= 2.29, the hook is missing

After: always write proc-receive hook for all git versions

  • If the git version is < 2.29: the hook should be a no-op, and the proc-receive feature is disabled by Gitea backend
  • If the git version is >= 2.29: the proc-receive just works (as before)

Compare by ignoring whitespace: https://github.com/go-gitea/gitea/pull/29287/files?diff=unified&w=1

@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Feb 21, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 21, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 21, 2024
@wxiaoguang wxiaoguang added the backport/v1.21 This PR should be backported to Gitea 1.21 label Feb 21, 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 Feb 21, 2024
@GiteaBot GiteaBot 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 Feb 21, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) February 21, 2024 06:37
@wxiaoguang wxiaoguang merged commit 7f45dfb into go-gitea:main Feb 21, 2024
26 checks passed
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 29287
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024
@wxiaoguang wxiaoguang deleted the fix-git-hook branch February 21, 2024 07:16
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Feb 21, 2024
@wxiaoguang
Always write proc-receive hook for all git versions (go-gitea#29287)
aee6378
@wxiaoguang wxiaoguang mentioned this pull request Feb 21, 2024
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Feb 21, 2024
6543 pushed a commit that referenced this pull request Feb 21, 2024
@wxiaoguang
Always write proc-receive hook for all git versions (#29287) (#29291)
9379352 
Backport #29287
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 22, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
cc8215a 
* giteaofficial/main: (32 commits)
  [skip ci] Updated translations via Crowdin
  Prevent double use of `git cat-file` session. (go-gitea#29298)
  Revert go-gitea#28753 because UI broken. (go-gitea#29293)
  Fix error display when merging PRs (go-gitea#29288)
  Refactor markup rendering to accept general "protocol:" prefix (go-gitea#29276)
  Remove jQuery from the installation page (go-gitea#29284)
  Always write proc-receive hook for all git versions (go-gitea#29287)
  Do not use `ctx.Doer` when reset password (go-gitea#29289)
  Update Discord logo (go-gitea#29285)
  [skip ci] Updated translations via Crowdin
  Remove jQuery .map() and enable eslint rules for it (go-gitea#29272)
  Explained where create issue/PR template (go-gitea#29035) (go-gitea#29266)
  Remove jQuery from repo wiki creation page (go-gitea#29271)
  Do not show delete button when time tracker is disabled (go-gitea#29257)
  Left align the input labels for the link account page (go-gitea#29255)
  [skip ci] Updated translations via Crowdin
  Remove jQuery from the repo migration form (go-gitea#29229)
  Fix content size does not match error when uploading lfs file (go-gitea#29259)
  Workaround to clean up old reviews on creating a new one (go-gitea#28554)
  Deduplicate translations for contributors graph (go-gitea#29256)
  ...
@github-actions GitHub Actions
Copy link

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@wolfogre wolfogre wolfogre approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@wxiaoguang @GiteaBot @lunny @wolfogre @a1012112796