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
..
e2e	Change green buttons to primary color (#27099)	2023-09-18 22:05:31 +00:00
fuzz	Rework markup link rendering (#26745) (#28803)	2024-01-16 02:13:29 +00:00
gitea-lfs-meta	Test views of LFS files (#22196)	2022-12-23 07:41:56 +08:00
gitea-repositories-meta	Fix reverting a merge commit failing (#28794) (#28825)	2024-01-21 14:18:37 +00:00
integration	Fix reverting a merge commit failing (#28794) (#28825)	2024-01-21 14:18:37 +00:00
testdata/data/attachments/a/0	Allow get release download files and lfs files with oauth2 token format (#26430) (#27379)	2023-10-01 19:54:11 +08:00
mssql.ini.tmpl	Remove duplicated notify mail configuration on tests (#26912)	2023-09-05 12:34:36 +02:00
mysql8.ini.tmpl	Do not use deprecated log config options by default (#26592)	2023-08-20 01:05:29 +00:00
mysql.ini.tmpl	Remove duplicated notify mail configuration on tests (#26912)	2023-09-05 12:34:36 +02:00
pgsql.ini.tmpl	Remove duplicated notify mail configuration on tests (#26912)	2023-09-05 12:34:36 +02:00
sqlite.ini.tmpl	Do not use deprecated log config options by default (#26592)	2023-08-20 01:05:29 +00:00
test_utils.go	Allow get release download files and lfs files with oauth2 token format (#26430) (#27379)	2023-10-01 19:54:11 +08:00