Fix reverting a merge commit failing #28794

me-heer · 2024-01-15T07:42:56Z

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.
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:

$ 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

wxiaoguang

Could there be some tests to cover the behavior? (Haven't read the details carefully yet)

me-heer · 2024-01-15T10:11:10Z

Could there be some tests to cover the behavior? (Haven't read the details carefully yet)

Yes, I was going to work on them after this is merged/I'm sure the approach is right.

Do tests covering this new behavior go in the same PR or another PR usually?

wxiaoguang · 2024-01-15T10:15:05Z

Could there be some tests to cover the behavior? (Haven't read the details carefully yet)

Yes, I was going to work on them after this is merged/I'm sure the approach is right.

Do tests covering this new behavior go in the same PR or another PR usually?

Usually (and preferred) to make the tests go in the same PR.

lunny · 2024-01-16T03:10:36Z

It seems it works in my manually local tests.

wxiaoguang

I haven't thought deeply about this (eg: potential other approaches? no idea yet ....). Since it has been covered by tests and is better than before, I would vote my approval.

GiteaBot · 2024-01-16T15:06:56Z

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

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

* giteaofficial/main: Retarget depending pulls when the parent branch is deleted (go-gitea#28686) Bump `@github/relative-time-element` to 4.3.1 (go-gitea#28819) Fix reverting a merge commit failing (go-gitea#28794) Render code block in activity tab (go-gitea#28816) Remove trust model selection from repository creation on web page because it can be changed in settings later (go-gitea#28814)

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 ```

Backport #28794 Fixes #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. 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: ```bash $ git update-index --refresh $ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00 ```

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 ```

Backport go-gitea/gitea#28794 Fixes #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/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: ```bash $ git update-index --refresh $ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00 ``` (cherry picked from commit 62f2d71)

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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.home/nrdufour/home-ops/pulls/355 Co-authored-by: Renovate <renovate@ptinem.io> Co-committed-by: Renovate <renovate@ptinem.io>

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 ```

me-heer added 2 commits January 13, 2024 15:49

Add option to clone temp repo as non-bare

bb371ae

Refresh index after cloning temp default repository

7b7bf25

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 15, 2024

pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 15, 2024

lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Jan 15, 2024

lunny requested review from wxiaoguang and KN4CK3R January 15, 2024 08:11

lunny added this to the 1.22.0 milestone Jan 15, 2024

wxiaoguang reviewed Jan 15, 2024

View reviewed changes

Add merge commit revert test

f09cafc

pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 16, 2024

me-heer added 2 commits January 16, 2024 13:19

Fix import formatting

adf8ae2

Fix unused Sprintf

4f1896c

wxiaoguang approved these changes Jan 16, 2024

View reviewed changes

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 16, 2024

lunny approved these changes Jan 16, 2024

View reviewed changes

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 16, 2024

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 16, 2024

GiteaBot added 2 commits January 16, 2024 22:37

Merge branch 'main' into cherryPickRevertFix

41b5493

Merge branch 'main' into cherryPickRevertFix

c181770

lunny enabled auto-merge (squash) January 16, 2024 14:42

lunny merged commit b827024 into go-gitea:main Jan 16, 2024
25 checks passed

GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jan 16, 2024

me-heer mentioned this pull request Jan 17, 2024

Fix reverting a merge commit failing (#28794) #28825

Merged

lunny added the backport/done All backports for this PR have been created label Jan 17, 2024

github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix reverting a merge commit failing #28794

Fix reverting a merge commit failing #28794

me-heer commented Jan 15, 2024

wxiaoguang left a comment

me-heer commented Jan 15, 2024

wxiaoguang commented Jan 15, 2024

lunny commented Jan 16, 2024

wxiaoguang left a comment

GiteaBot commented Jan 16, 2024

Fix reverting a merge commit failing #28794

Fix reverting a merge commit failing #28794

Conversation

me-heer commented Jan 15, 2024

wxiaoguang left a comment

Choose a reason for hiding this comment

me-heer commented Jan 15, 2024

wxiaoguang commented Jan 15, 2024

lunny commented Jan 16, 2024

wxiaoguang left a comment

Choose a reason for hiding this comment

GiteaBot commented Jan 16, 2024