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

Support the new exit code for git remote subcommands for git version >=2.30.0 #33129

Merged
merged 11 commits into from
Jan 7, 2025

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Jan 7, 2025

Fix #32889

The root reason can be found in: #32889 (comment)

ps: how to test it in CI? I have tested the issue mentioned in #32889 by manually remove the remote and I see the 500 error and this PR can fix it in this case.

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 7, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jan 7, 2025
@yp05327 yp05327 changed the title Update the exit status for git remote subcommands in new git version Support the new exit code for git remote subcommands for git version >=2.30.0 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 added backport/v1.23 This PR should be backported to Gitea 1.23 type/bug labels Jan 7, 2025
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 7, 2025
@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 7, 2025
@wxiaoguang wxiaoguang merged commit 0d7d2ed into go-gitea:main Jan 7, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Jan 7, 2025
@GiteaBot
Copy link
Collaborator

GiteaBot commented Jan 7, 2025

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

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

@wxiaoguang wxiaoguang deleted the fix-32889 branch January 7, 2025 12:42
@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Jan 7, 2025
wxiaoguang pushed a commit to wxiaoguang/gitea that referenced this pull request Jan 7, 2025
…n >=2.30.0 (go-gitea#33129)

Fix go-gitea#32889

---------

Co-authored-by: wxiaoguang <[email protected]>
# Conflicts:
#	modules/git/remote.go
@wxiaoguang
Copy link
Contributor

Backport Support the new exit code for git remote subcommands for git version >=2.30.0 (#33129) #33133

@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Jan 7, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 8, 2025
* giteaofficial/main:
  add submodule diff links (go-gitea#33097)
  [skip ci] Updated translations via Crowdin
  Update status check for all supported on.pull_request.types in Gitea (go-gitea#33117)
  Support the new exit code for `git remote` subcommands for git version >=2.30.0 (go-gitea#33129)
  Make git clone URL could use current signed-in user (go-gitea#33091)
  Filter reviews of one pull request in memory instead of database to reduce slow response because of lacking database index (go-gitea#33106)
lunny pushed a commit that referenced this pull request Jan 8, 2025
…#33133)

And update some dependencies to fix bugs.

Backport  #33129, #33136

Fix #32889
Fix #33141
Fix #33139

---------

Co-authored-by: yp05327 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.23 This PR should be backported to Gitea 1.23 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CleanUpMigrateInfo: exit status 2 - error: No such remote: 'origin'
4 participants