1
0
Fork 0
forgejo/services/repository
Mihir Joshi b8270240bf
Fix reverting a merge commit failing (#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.

bb371aee6e
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
```
2024-01-16 15:06:51 +00:00
..
archiver Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
files Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
adopt.go
adopt_test.go
avatar.go
avatar_test.go
branch.go Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
cache.go Always enable caches (#28527) 2023-12-19 09:29:05 +00:00
check.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
collaboration.go
collaboration_test.go
commit.go
create.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
create_test.go
delete.go
delete_test.go
fork.go
fork_test.go
hooks.go
lfs.go Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
lfs_test.go Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220) 2023-12-07 15:27:36 +08:00
main_test.go
push.go Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
repository.go
repository_test.go
review.go
review_test.go
setting.go Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
template.go
transfer.go
transfer_test.go