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 git 2.11 error when checking IsEmpty (again) #27399

Merged
merged 2 commits into from
Oct 2, 2023

Conversation

wxiaoguang
Copy link
Contributor

Follow #27393

Sorry that I made a mistake in #27393. The errbuf is not empty when the err is exit status 129.

@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/manual No power to the bots! Create your backport yourself! labels Oct 2, 2023
@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Oct 2, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 2, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 2, 2023
@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 Oct 2, 2023
@delvh
Copy link
Member

delvh commented Oct 2, 2023

For reference, the backports are already contained in #27396 and #27397

@wxiaoguang wxiaoguang changed the title Fix git 2.11 error when checking IsEmpty again Fix git 2.11 error when checking IsEmpty (again) Oct 2, 2023
@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 Oct 2, 2023
@lunny lunny enabled auto-merge (squash) October 2, 2023 15:30
@lunny lunny merged commit dfa4e58 into go-gitea:main Oct 2, 2023
@wxiaoguang wxiaoguang deleted the fix-git-isempty branch October 3, 2023 00:45
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 1, 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/manual No power to the bots! Create your backport yourself! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants