You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ```		1 year ago
..
actions	Fix schedule tasks bugs (#28691) (#28780)	1 year ago
agit	Move notification interface to services layer (#26915)	1 year ago
asymkey	Another round of `db.DefaultContext` refactor (#27103) (#27262)	1 year ago
attachment	move repository deletion to service layer (#26948)	1 year ago
auth	Deprecate query string auth tokens (#28390) (#28430)	1 year ago
automerge	Improve queue and logger context (#24924)	2 years ago
context	Another round of `db.DefaultContext` refactor (#27103) (#27262)	1 year ago
convert	Fix `convert.ToTeams` on empty input (#28426) (#28767)	1 year ago
cron	Recover from panic in cron task (#28409) (#28425)	1 year ago
externalaccount	More `db.DefaultContext` refactor (#27265) (#27347)	1 year ago
feed	More `db.DefaultContext` refactor (#27265) (#27347)	1 year ago
forms	Fix required error for token name (#28267) (#28284)	1 year ago
gitdiff	Add option to disable ambiguous unicode characters detection (#28454) (#28499)	1 year ago
indexer	Fix missing issue search index update when changing status (#28325) (#28330)	1 year ago
issue	Avoid run change title process when the title is same (#27467) (#27558)	1 year ago
lfs	Bump github.com/golang-jwt/jwt to v5 (#25975)	2 years ago
mailer	Rework markup link rendering (#26745) (#28803)	1 year ago
markup	Move web/api context related testing function into a separate package (#26859)	1 year ago
migrations	Use known issue IID to generate new PR index number when migrating from GitLab (#28616) (#28618)	1 year ago
mirror	More `db.DefaultContext` refactor (#27265) (#27347)	1 year ago
notify	Update status and code index after changing the default branch (#27018)	1 year ago
org	Delete repos of org when purge delete user (#27273) (#27728)	1 year ago
packages	Fix reverting a merge commit failing (#28794) (#28825)	1 year ago
pull	Concatenate error in `checkIfPRContentChanged` (#28731) (#28737)	1 year ago
release	Fix comment permissions (#28213) (#28216)	1 year ago
repository	Fix reverting a merge commit failing (#28794) (#28825)	1 year ago
secrets	Refactor secrets modification logic (#26873)	1 year ago
task	Fix incorrect ctx usage in defer function (#27740) (#27741)	1 year ago
uinotification	More `db.DefaultContext` refactor (#27265) (#27347)	1 year ago
user	Forbid removing the last admin user (#28337) (#28793)	1 year ago
webhook	Fix comment permissions (#28213) (#28216)	1 year ago
wiki	Fix schedule tasks bugs (#28691) (#28780)	1 year ago