-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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 reverting a merge commit failing (#28794) #28825
Merged
lunny
merged 2 commits into
go-gitea:release/v1.21
from
me-heer:mergeCommitRevertFixBackport
Jan 21, 2024
Merged
Fix reverting a merge commit failing (#28794) #28825
lunny
merged 2 commits into
go-gitea:release/v1.21
from
me-heer:mergeCommitRevertFixBackport
Jan 21, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes go-gitea#22236 --- Error occurring currently while trying to revert commit using read-tree -m approach: > 2022/12/26 16:04:43 ...rvices/pull/patch.go:240:AttemptThreeWayMerge() [E] [63a9c61a] Unable to run read-tree -m! Error: exit status 128 - fatal: this operation must be run in a work tree > - fatal: this operation must be run in a work tree We need to clone a non-bare repository for `git read-tree -m` to work. go-gitea@bb371ae adds support to create a non-bare cloned temporary upload repository. After cloning a non-bare temporary upload repository, we [set default index](https://github.com/go-gitea/gitea/blob/main/services/repository/files/cherry_pick.go#L37) (`git read-tree HEAD`). This operation ends up resetting the git index file (see investigation details below), due to which, we need to call `git update-index --refresh` afterward. Here's the diff of the index file before and after we execute SetDefaultIndex: https://www.diffchecker.com/hyOP3eJy/ Notice the **ctime**, **mtime** are set to 0 after SetDefaultIndex. You can reproduce the same behavior using these steps: ```bash $ git clone https://try.gitea.io/me-heer/test.git -s -b main $ cd test $ git read-tree HEAD $ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00 error: Entry '1' not uptodate. Cannot merge. ``` After which, we can fix like this: ``` $ git update-index --refresh $ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00 ```
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Jan 17, 2024
pull-request-size
bot
added
the
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
label
Jan 17, 2024
lunny
approved these changes
Jan 17, 2024
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 17, 2024
denyskon
approved these changes
Jan 21, 2024
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 21, 2024
denyskon
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Jan 21, 2024
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Jan 21, 2024
nrdufour
added a commit
to nrdufour/home-ops
that referenced
this pull request
Feb 4, 2024
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.21.4` -> `1.21.5` | --- ### Release Notes <details> <summary>go-gitea/gitea (docker.io/gitea/gitea)</summary> ### [`v1.21.5`](https://github.com/go-gitea/gitea/releases/tag/v1.21.5) [Compare Source](go-gitea/gitea@v1.21.4...v1.21.5) - SECURITY - Prevent anonymous container access if `RequireSignInView` is enabled ([#​28877](go-gitea/gitea#28877)) ([#​28882](go-gitea/gitea#28882)) - Update go dependencies and fix go-git ([#​28893](go-gitea/gitea#28893)) ([#​28934](go-gitea/gitea#28934)) - BUGFIXES - Revert "Speed up loading the dashboard on mysql/mariadb ([#​28546](go-gitea/gitea#28546))" ([#​29006](go-gitea/gitea#29006)) ([#​29007](go-gitea/gitea#29007)) - Fix an actions schedule bug ([#​28942](go-gitea/gitea#28942)) ([#​28999](go-gitea/gitea#28999)) - Fix update enable_prune even if mirror_interval is not provided ([#​28905](go-gitea/gitea#28905)) ([#​28929](go-gitea/gitea#28929)) - Fix uploaded artifacts should be overwritten ([#​28726](go-gitea/gitea#28726)) backport v1.21 ([#​28832](go-gitea/gitea#28832)) - Preserve BOM in web editor ([#​28935](go-gitea/gitea#28935)) ([#​28959](go-gitea/gitea#28959)) - Strip `/` from relative links ([#​28932](go-gitea/gitea#28932)) ([#​28952](go-gitea/gitea#28952)) - Don't remove all mirror repository's releases when mirroring ([#​28817](go-gitea/gitea#28817)) ([#​28939](go-gitea/gitea#28939)) - Implement `MigrateRepository` for the actions notifier ([#​28920](go-gitea/gitea#28920)) ([#​28923](go-gitea/gitea#28923)) - Respect branch info for relative links ([#​28909](go-gitea/gitea#28909)) ([#​28922](go-gitea/gitea#28922)) - Don't reload timeline page when (un)resolving or replying conversation ([#​28654](go-gitea/gitea#28654)) ([#​28917](go-gitea/gitea#28917)) - Only migrate the first 255 chars of a Github issue title ([#​28902](go-gitea/gitea#28902)) ([#​28912](go-gitea/gitea#28912)) - Fix sort bug on repository issues list ([#​28897](go-gitea/gitea#28897)) ([#​28901](go-gitea/gitea#28901)) - Fix `DeleteCollaboration` transaction behaviour ([#​28886](go-gitea/gitea#28886)) ([#​28889](go-gitea/gitea#28889)) - Fix schedule not trigger bug because matching full ref name with short ref name ([#​28874](go-gitea/gitea#28874)) ([#​28888](go-gitea/gitea#28888)) - Fix migrate storage bug ([#​28830](go-gitea/gitea#28830)) ([#​28867](go-gitea/gitea#28867)) - Fix archive creating LFS hooks and breaking pull requests ([#​28848](go-gitea/gitea#28848)) ([#​28851](go-gitea/gitea#28851)) - Fix reverting a merge commit failing ([#​28794](go-gitea/gitea#28794)) ([#​28825](go-gitea/gitea#28825)) - Upgrade xorm to v1.3.7 to fix a resource leak problem caused by Iterate ([#​28891](go-gitea/gitea#28891)) ([#​28895](go-gitea/gitea#28895)) - Fix incorrect PostgreSQL connection string for Unix sockets ([#​28865](go-gitea/gitea#28865)) ([#​28870](go-gitea/gitea#28870)) - ENHANCEMENTS - Make loading animation less aggressive ([#​28955](go-gitea/gitea#28955)) ([#​28956](go-gitea/gitea#28956)) - Avoid duplicate JS error messages on UI ([#​28873](go-gitea/gitea#28873)) ([#​28881](go-gitea/gitea#28881)) - Bump `@github/relative-time-element` to 4.3.1 ([#​28819](go-gitea/gitea#28819)) ([#​28826](go-gitea/gitea#28826)) - MISC - Warn that `DISABLE_QUERY_AUTH_TOKEN` is false only if it's explicitly defined ([#​28783](go-gitea/gitea#28783)) ([#​28868](go-gitea/gitea#28868)) - Remove duplicated checkinit on git module ([#​28824](go-gitea/gitea#28824)) ([#​28831](go-gitea/gitea#28831)) Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNjUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE2NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> Reviewed-on: https://git.home/nrdufour/home-ops/pulls/355 Co-authored-by: Renovate <[email protected]> Co-committed-by: Renovate <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #28794
Fixes #22236
Error occurring currently while trying to revert commit using read-tree -m approach:
We need to clone a non-bare repository for
git read-tree -m
to work.bb371ae adds support to create a non-bare cloned temporary upload repository.
After cloning a non-bare temporary upload repository, we set default index (
git read-tree HEAD
).This operation ends up resetting the git index file (see investigation details below), due to which, we need to call
git update-index --refresh
afterward.Here's the diff of the index file before and after we execute SetDefaultIndex: https://www.diffchecker.com/hyOP3eJy/
Notice the ctime, mtime are set to 0 after SetDefaultIndex.
You can reproduce the same behavior using these steps:
After which, we can fix like this: