Drambluker
/
itdoxy-lab
mirror of https://github.com/Drambluker/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
itdoxy-lab/services/packages
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
..
alpine Fix possible nil pointer access (#28428) 2023-12-12 13:51:33 +00:00
cargo Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
cleanup Fix alpine package files are not rebuilt (#28638) 2023-12-31 12:08:46 +08:00
container Fix possible nil pointer access (#28428) 2023-12-12 13:51:33 +00:00
debian Fix possible nil pointer access (#28428) 2023-12-12 13:51:33 +00:00
rpm Support for grouping RPMs using paths (#26984) 2024-01-12 03:16:05 +00:00
auth.go Bump github.com/golang-jwt/jwt to v5 (#25975) 2023-07-19 09:57:10 +00:00
packages.go Revert "packages: Calculate package size quota using package creator ID instead of owner ID (#28007)" (#28049) 2023-11-14 16:03:56 +01:00