Mihir Joshi 54a6dc73ef 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 ``` (cherry picked from commit 62f2d717b7)		2024-01-31 14:18:25 +01:00
..
archiver	Next round of db.DefaultContext refactor (#27089)	2023-09-16 14:39:12 +00:00
files	Fix reverting a merge commit failing (#28794) (#28825)	2024-01-31 14:18:25 +01:00
adopt.go	Delete repos of org when purge delete user (#27273) (#27728)	2023-11-01 10:03:12 +08:00
adopt_test.go
avatar.go
avatar_test.go
branch.go	services: Gracefully handle missing branches	2024-01-15 00:15:12 +01:00
cache.go
check.go	move repository deletion to service layer (#26948)	2023-09-08 04:51:15 +00:00
collaboration.go	Next round of db.DefaultContext refactor (#27089)	2023-09-16 14:39:12 +00:00
collaboration_test.go	Next round of db.DefaultContext refactor (#27089)	2023-09-16 14:39:12 +00:00
commit.go	Show branches and tags that contain a commit (#25180)	2023-07-27 12:47:41 +02:00
create.go	move repository deletion to service layer (#26948)	2023-09-08 04:51:15 +00:00
create_test.go	More refactoring of db.DefaultContext (#27083)	2023-09-15 06:13:19 +00:00
delete.go	Delete repos of org when purge delete user (#27273) (#27728)	2023-11-01 10:03:12 +08:00
delete_test.go	Delete repos of org when purge delete user (#27273) (#27728)	2023-11-01 10:03:12 +08:00
fork.go	Another round of db.DefaultContext refactor (#27103) (#27262)	2023-09-25 19:24:35 +02:00
fork_test.go
hooks.go
lfs.go
lfs_test.go	Delete repos of org when purge delete user (#27273) (#27728)	2023-11-01 10:03:12 +08:00
main_test.go
push.go	Also sync DB branches on push if necessary (#28361) (#28403)	2023-12-12 15:21:33 +01:00
repository.go	Next round of db.DefaultContext refactor (#27089)	2023-09-16 14:39:12 +00:00
repository_test.go
review.go
review_test.go
template.go	Move notification interface to services layer (#26915)	2023-09-05 18:37:47 +00:00
transfer.go	[MODERATION] User blocking	2023-11-13 13:58:02 +01:00
transfer_test.go	[MODERATION] User blocking	2023-11-13 13:58:02 +01:00