gitea/services
Mihir Joshi 62f2d717b7
Fix reverting a merge commit failing (#28794) (#28825)
Backport https://github.com/go-gitea/gitea/pull/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:
```bash
$ git update-index --refresh
$ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00
```
2024-01-21 14:18:37 +00:00
..
actions Fix schedule tasks bugs (#28691) (#28780) 2024-01-14 23:54:22 +01:00
agit Move notification interface to services layer (#26915) 2023-09-05 18:37:47 +00:00
asymkey Another round of `db.DefaultContext` refactor (#27103) (#27262) 2023-09-25 19:24:35 +02:00
attachment move repository deletion to service layer (#26948) 2023-09-08 04:51:15 +00:00
auth Deprecate query string auth tokens (#28390) (#28430) 2023-12-12 13:45:00 +08:00
automerge Improve queue and logger context (#24924) 2023-05-26 07:31:55 +00:00
context Another round of `db.DefaultContext` refactor (#27103) (#27262) 2023-09-25 19:24:35 +02:00
convert Fix `convert.ToTeams` on empty input (#28426) (#28767) 2024-01-12 07:12:18 +00:00
cron Recover from panic in cron task (#28409) (#28425) 2023-12-12 03:28:56 +00:00
externalaccount More `db.DefaultContext` refactor (#27265) (#27347) 2023-09-29 13:35:01 +00:00
feed More `db.DefaultContext` refactor (#27265) (#27347) 2023-09-29 13:35:01 +00:00
forms Fix required error for token name (#28267) (#28284) 2023-11-29 23:00:32 +08:00
gitdiff Add option to disable ambiguous unicode characters detection (#28454) (#28499) 2023-12-18 12:20:37 +08:00
indexer Fix missing issue search index update when changing status (#28325) (#28330) 2023-12-03 11:43:17 +00:00
issue Avoid run change title process when the title is same (#27467) (#27558) 2023-10-10 09:01:46 +02:00
lfs Bump github.com/golang-jwt/jwt to v5 (#25975) 2023-07-19 09:57:10 +00:00
mailer Rework markup link rendering (#26745) (#28803) 2024-01-16 02:13:29 +00:00
markup Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
migrations Use known issue IID to generate new PR index number when migrating from GitLab (#28616) (#28618) 2023-12-27 09:59:29 +08:00
mirror More `db.DefaultContext` refactor (#27265) (#27347) 2023-09-29 13:35:01 +00: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) (#27728) 2023-11-01 10:03:12 +08:00
packages Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00:00
pull Concatenate error in `checkIfPRContentChanged` (#28731) (#28737) 2024-01-09 14:06:12 +00:00
release Fix comment permissions (#28213) (#28216) 2023-11-25 23:43:23 +00:00
repository Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00:00
secrets Refactor secrets modification logic (#26873) 2023-09-05 15:21:02 +00:00
task Fix incorrect ctx usage in defer function (#27740) (#27741) 2023-10-22 14:36:49 +00:00
uinotification More `db.DefaultContext` refactor (#27265) (#27347) 2023-09-29 13:35:01 +00:00
user Forbid removing the last admin user (#28337) (#28793) 2024-01-16 01:51:46 +00:00
webhook Fix comment permissions (#28213) (#28216) 2023-11-25 23:43:23 +00:00
wiki Fix schedule tasks bugs (#28691) (#28780) 2024-01-14 23:54:22 +01:00