Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gitea/tests
History
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
..
e2e Require MySQL 8.0, PostgreSQL 12, MSSQL 2012 (#27337) 2023-10-03 13:27:57 -04:00
fuzz Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
gitea-lfs-meta Test views of LFS files (#22196) 2022-12-23 07:41:56 +08:00
gitea-repositories-meta Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
integration Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
testdata/data/attachments/a/0 Allow get release download files and lfs files with oauth2 token format (#26430) 2023-10-01 10:41:52 +00:00
mssql.ini.tmpl Disable query token param in integration tests (#28592) 2023-12-23 11:29:51 +08:00
mysql.ini.tmpl Disable query token param in integration tests (#28592) 2023-12-23 11:29:51 +08:00
pgsql.ini.tmpl Disable query token param in integration tests (#28592) 2023-12-23 11:29:51 +08:00
sqlite.ini.tmpl Disable query token param in integration tests (#28592) 2023-12-23 11:29:51 +08:00
test_utils.go Allow get release download files and lfs files with oauth2 token format (#26430) 2023-10-01 10:41:52 +00:00