diff options
author | Mihir Joshi <mihir67mj@gmail.com> | 2024-01-16 20:36:51 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-16 15:06:51 +0000 |
commit | b8270240bf53cdf4ed3267a395347272cf48b176 (patch) | |
tree | be6e6c30f72a337100d56046e8313a91a66c705e /package-lock.json | |
parent | edfb57e6996367ec2c682fd7fdbdb405728c001f (diff) | |
download | gitea-b8270240bf53cdf4ed3267a395347272cf48b176.tar.gz gitea-b8270240bf53cdf4ed3267a395347272cf48b176.zip |
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.
https://github.com/go-gitea/gitea/commit/bb371aee6ecf5e570cdf7b5f7f0d6f47a607a325
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
```
Diffstat (limited to 'package-lock.json')
0 files changed, 0 insertions, 0 deletions