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

Fix git remote error check, fix dependencies, fix js error (#33129) #33133

Merged
merged 5 commits into from
Jan 8, 2025
Merged

Fix git remote error check, fix dependencies, fix js error (#33129) #33133

merged 5 commits into from
Jan 8, 2025

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jan 7, 2025 •
edited
Loading

And update some dependencies to fix bugs.

Backport #33129, #33136

Fix #32889
Fix #33141
Fix #33139

@yp05327 @wxiaoguang
Support the new exit code for git remote subcommands for git versio…
d251316 
…n >=2.30.0 (go-gitea#33129)

Fix go-gitea#32889

---------

Co-authored-by: wxiaoguang <[email protected]>
# Conflicts:
#	modules/git/remote.go
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jan 7, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 7, 2025
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 7, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 7, 2025
Merged
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jan 7, 2025
@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 Jan 7, 2025
@lunny lunny mentioned this pull request Jan 7, 2025
Merged
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 8, 2025
@wxiaoguang wxiaoguang changed the title Support the new exit code for git remote subcommands for git version >=2.30.0 (#33129) Fix git remote error check, fix dependencies (#33129) Jan 8, 2025
@wxiaoguang wxiaoguang force-pushed the backport-git-remote branch from bf79712 to 42664ff Compare January 8, 2025 00:37
@wxiaoguang wxiaoguang force-pushed the backport-git-remote branch from 42664ff to eb87a05 Compare January 8, 2025 00:40
@wxiaoguang wxiaoguang changed the title Fix git remote error check, fix dependencies (#33129) Fix git remote error check, fix dependencies, fix js error (#33129) Jan 8, 2025
This was referenced Jan 8, 2025
Closed
Closed
@wxiaoguang wxiaoguang mentioned this pull request Jan 8, 2025
Closed
@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 Jan 8, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 8, 2025
@lunny lunny enabled auto-merge (squash) January 8, 2025 04:44
@lunny lunny merged commit 531f36e into go-gitea:release/v1.23 Jan 8, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 8, 2025
@wxiaoguang wxiaoguang deleted the backport-git-remote branch January 8, 2025 06:29
This was referenced Jan 16, 2025
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yp05327 yp05327 yp05327 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/frontend modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @lunny @yp05327 @GiteaBot