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
activities
admin
asymkey	Move more functions to db.Find (#28419)	2024-01-15 02:19:25 +00:00
auth	Move more functions to db.Find (#28419)	2024-01-15 02:19:25 +00:00
avatars
db	Move more functions to db.Find (#28419)	2024-01-15 02:19:25 +00:00
dbfs
fixtures	Fix reverting a merge commit failing (#28794)	2024-01-16 15:06:51 +00:00
git	Fix GetCommitStatuses (#28787)	2024-01-15 14:07:32 +00:00
issues	Add ability to see open and closed issues at the same time (#28757)	2024-01-15 15:07:22 +00:00
migrations	Add branch protection setting for ignoring stale approvals (#28498)	2024-01-15 07:20:01 +00:00
organization
packages
perm
project
pull
repo	Rework markup link rendering (#26745)	2024-01-15 08:49:24 +00:00
secret
shared/types
system
unit
unittest
user	Forbid removing the last admin user (#28337)	2024-01-15 06:51:43 +00:00
webhook
error.go	Forbid removing the last admin user (#28337)	2024-01-15 06:51:43 +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