tdsds.com/gitea
tdsds.com
/
gitea
mirror of https://github.com/go-gitea/gitea
1
1
Fork 0
Code Releases Activity
gitea/tests/gitea-repositories-meta
History
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
..
limited_org Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
migration/lfs-test.git Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
org3 Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052) 2023-09-14 02:59:53 +00:00
org26 Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
privated_org Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
user2 Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00:00
user5/repo4.git Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
user12/repo10.git Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
user13/repo11.git Kd/ci playwright go test (#20123) 2022-09-02 15:18:23 -04:00
user27 Substitute variables in path names of template repos too (#25294) 2023-06-20 21:14:47 +00:00
user30 Add a simple test for external renderer (#20033) 2022-12-12 20:45:21 +08:00