gitea/services
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
..
actions Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
agit Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
asymkey Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
attachment Even more `db.DefaultContext` refactor (#27352) 2023-10-03 10:30:41 +00:00
auth Refactor timeutil package (#28623) 2023-12-28 10:09:57 +00:00
automerge Improve queue and logger context (#24924) 2023-05-26 07:31:55 +00:00
context Another round of `db.DefaultContext` refactor (#27103) 2023-09-25 13:17:37 +00:00
convert Add branch protection setting for ignoring stale approvals (#28498) 2024-01-15 07:20:01 +00:00
cron Update go dependencies (#28518) 2023-12-19 09:18:42 +08:00
externalaccount Final round of `db.DefaultContext` refactor (#27587) 2023-10-14 08:37:24 +00:00
feed More `db.DefaultContext` refactor (#27265) 2023-09-29 12:12:54 +00:00
forms Remove trust model selection from repository creation on web page because it can be changed in settings later (#28814) 2024-01-16 20:54:48 +08:00
gitdiff Add option to disable ambiguous unicode characters detection (#28454) 2023-12-17 14:38:54 +00:00
indexer Fix missing issue search index update when changing status (#28325) 2023-12-03 12:22:44 +01:00
issue Remove deadcode under models/issues (#28536) 2023-12-19 20:12:02 +01:00
lfs 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
mailer Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
markup make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
migrations Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
mirror Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
notify Update status and code index after changing the default branch (#27018) 2023-09-13 04:43:31 +00:00
org Delete repos of org when purge delete user (#27273) 2023-10-19 13:16:11 +00:00
packages Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
pull Concatenate error in `checkIfPRContentChanged` (#28731) 2024-01-09 10:32:14 +08:00
release Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
repository Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
secrets Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
task Fix incorrect ctx usage in defer function (#27740) 2023-10-22 14:12:27 +00:00
uinotification Penultimate round of `db.DefaultContext` refactor (#27414) 2023-10-11 04:24:07 +00:00
user Forbid removing the last admin user (#28337) 2024-01-15 06:51:43 +00:00
webhook Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
wiki Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00