rdelaage
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gitea/services/repository/files
History
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
..
cherry_pick.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
commit.go Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
content.go Replace `interface{}` with `any` (#25686) 2023-07-04 18:36:08 +00:00
content_test.go make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
diff.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
diff_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
file.go API endpoint for changing/creating/deleting multiple files (#24887) 2023-05-29 17:41:35 +08:00
file_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
patch.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
temp_repo.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
tree.go Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
tree_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
update.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
upload.go Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00