1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-26 13:29:12 -05:00
forgejo/services/repository
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
..
archiver Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
files Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
adopt.go Replace more db.DefaultContext (#27628) 2023-10-15 17:46:06 +02:00
adopt_test.go Use more specific test methods (#24265) 2023-04-22 17:56:27 -04:00
avatar.go Improve avatar uploading / resizing / compressing, remove Fomantic card module (#24653) 2023-05-13 20:59:11 +02:00
avatar_test.go Use context parameter in services/repository (#23186) 2023-02-28 16:17:51 -06:00
branch.go Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
cache.go Always enable caches (#28527) 2023-12-19 09:29:05 +00:00
check.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +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 Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
create_test.go Remove unnecessary parameter (#27671) 2023-10-18 15:03:10 +00:00
delete.go Use db.Find instead of writing methods for every object (#28084) 2023-11-24 03:49:41 +00:00
delete_test.go Delete repos of org when purge delete user (#27273) 2023-10-19 13:16:11 +00:00
fork.go Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
fork_test.go Add option to prohibit fork if user reached maximum limit of repositories (#21848) 2022-12-27 15:21:14 -06:00
hooks.go Use db.Find instead of writing methods for every object (#28084) 2023-11-24 03:49:41 +00:00
lfs.go Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
lfs_test.go Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220) 2023-12-07 15:27:36 +08:00
main_test.go make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
push.go Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
repository.go Remove unnecessary parameter (#27671) 2023-10-18 15:03:10 +00:00
repository_test.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
review.go Use context parameter in services/repository (#23186) 2023-02-28 16:17:51 -06:00
review_test.go Use context parameter in services/repository (#23186) 2023-02-28 16:17:51 -06:00
setting.go Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
template.go Move notification interface to services layer (#26915) 2023-09-05 18:37:47 +00:00
transfer.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
transfer_test.go Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052) 2023-09-14 02:59:53 +00:00