gitea

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` ```		5 months ago
..
commits_search_test.git	Kd/ci playwright go test (#20123)	1 year ago
commitsonpr.git	Add commits dropdown in PR files view and allow commit by commit review (#25528)	11 months ago
git_hooks_test.git	Kd/ci playwright go test (#20123)	1 year ago
glob.git	Kd/ci playwright go test (#20123)	1 year ago
lfs.git	Test views of LFS files (#22196)	1 year ago
readme-test.git	Test renderReadmeFile (#23185)	1 year ago
repo-release.git	Remove git sample files and ignore them (#24271)	1 year ago
repo1.git	Replace `repo.namedBlob` by `git.TreeEntry`. (#22898)	1 year ago
repo1.wiki.git	Kd/ci playwright go test (#20123)	1 year ago
repo2.git	Allow get release download files and lfs files with oauth2 token format (#26430) (#27379)	8 months ago
repo15.git	Kd/ci playwright go test (#20123)	1 year ago
repo16.git	Kd/ci playwright go test (#20123)	1 year ago
repo20.git	Use beforeCommit instead of baseCommit (#22949)	1 year ago
test_commit_revert.git	Fix reverting a merge commit failing (#28794) (#28825)	5 months ago
utf8.git	Kd/ci playwright go test (#20123)	1 year ago