forgejo/models
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 Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
asymkey Retry SSH key verification with additional CRLF if it failed (#28392) (#28464) 2023-12-14 12:50:26 +08:00
auth Avoid cycle-redirecting user/login page (#28636) (#28658) 2023-12-30 20:50:08 +08:00
avatars Refactor system setting (#27000) (#27452) 2023-10-05 10:37:59 +00:00
db Avoid cycle-redirecting user/login page (#28636) (#28658) 2023-12-30 20:50:08 +08:00
dbfs Fix content holes in Actions task logs file (#25560) 2023-06-28 19:07:29 +02:00
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 handle repository.size column being NULL in migration v263 (#28336) (#28363) 2023-12-05 14:51:56 +00:00
organization Another round of db.DefaultContext refactor (#27103) (#27262) 2023-09-25 19:24:35 +02:00
packages move repository deletion to service layer (#26948) 2023-09-08 04:51:15 +00:00
perm move repository deletion to service layer (#26948) 2023-09-08 04:51:15 +00:00
project Fix comment permissions (#28213) (#28216) 2023-11-25 23:43:23 +00:00
pull refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
repo Rework markup link rendering (#26745) (#28803) 2024-01-16 02:13:29 +00:00
secret Refactor secrets modification logic (#26873) 2023-09-05 15:21:02 +00:00
shared/types Display owner of a runner as a tooltip instead of static text (#24377) 2023-05-12 08:43:27 +00:00
system Increase "version" when update the setting value to a same value as before (#28243) (#28244) 2023-11-28 01:58:39 +08:00
unit Use Set[Type] instead of map[Type]bool/struct{}. (#26804) 2023-08-30 06:55:25 +00:00
unittest Upgrade xorm (#27673) (#27691) 2023-10-19 10:56:39 +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
error.go Forbid removing the last admin user (#28337) (#28793) 2024-01-16 01:51:46 +00:00
fixture_generation.go Fix yaml test (#27297) (#27303) 2023-09-27 15:05:35 +08:00
fixture_test.go Fix yaml test (#27297) (#27303) 2023-09-27 15:05:35 +08:00
main_test.go move repository deletion to service layer (#26948) 2023-09-08 04:51:15 +00:00
org.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
org_team.go Use db.WithTx for AddTeamMember to avoid ctx abuse (#27095) 2023-09-16 12:54:23 +00:00
org_team_test.go Reduce usage of db.DefaultContext (#27073) 2023-09-14 17:09:32 +00:00
org_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo.go Refactor system setting (#27000) (#27452) 2023-10-05 10:37:59 +00:00
repo_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_transfer.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
repo_transfer_test.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00