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
activities	Speed up loading the dashboard on mysql/mariadb (#28546) (#28784)	2024-01-15 02:01:25 +00:00
admin	…
asymkey	…
auth	Avoid cycle-redirecting user/login page (#28636) (#28658)	2023-12-30 20:50:08 +08:00
avatars	…
db	Avoid cycle-redirecting user/login page (#28636) (#28658)	2023-12-30 20:50:08 +08:00
dbfs	…
fixtures	Fix reverting a merge commit failing (#28794) (#28825)	2024-01-21 14:18:37 +00:00
git	Fix `GetCommitStatuses` (#28787) (#28804)	2024-01-15 19:30:12 +01:00
issues	Rework markup link rendering (#26745) (#28803)	2024-01-16 02:13:29 +00:00
migrations	…
organization	…
packages	…
perm	…
project	…
pull	…
repo	Rework markup link rendering (#26745) (#28803)	2024-01-16 02:13:29 +00:00
secret	…
shared/types	…
system	…
unit	…
unittest	…
user	Forbid removing the last admin user (#28337) (#28793)	2024-01-16 01:51:46 +00:00
webhook	…
error.go	Forbid removing the last admin user (#28337) (#28793)	2024-01-16 01:51:46 +00:00
fixture_generation.go	…
fixture_test.go	…
main_test.go	…
org.go	…
org_team.go	…
org_team_test.go	…
org_test.go	…
repo.go	…
repo_test.go	…
repo_transfer.go	…
repo_transfer_test.go	…