foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 13:59:15 -05:00
Code Issues Wiki Activity
forgejo/models/fixtures
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
..
access.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
access_token.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
action.yml Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... (#23874) 2023-04-07 18:08:36 +08:00
action_run.yml Implement actions artifacts (#22738) 2023-05-19 21:37:57 +08:00
action_run_job.yml Implement actions artifacts (#22738) 2023-05-19 21:37:57 +08:00
action_runner_token.yml Add unit tests for action runner token (#27670) 2023-10-19 07:24:24 +00:00
action_task.yml Implement actions artifacts (#22738) 2023-05-19 21:37:57 +08:00
attachment.yml Allow get release download files and lfs files with oauth2 token format (#26430) 2023-10-01 10:41:52 +00:00
branch.yml Sync branches into databases (#22743) 2023-06-29 10:03:20 +00:00
collaboration.yml Fix "access" fixtures and tests (#10247) 2020-02-15 12:29:06 +08:00
comment.yml Fix comment permissions (#28213) 2023-11-25 17:21:21 +00:00
commit_status.yml Status-API (#1332) 2017-04-21 19:32:31 +08:00
commit_status_index.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
deploy_key.yml Writable deploy keys (closes #671) (#3225) 2018-01-07 00:55:53 +02:00
email_address.yml Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052) 2023-09-14 02:59:53 +00:00
external_login_user.yml add test coverage for original author conversion during migrations (#18506) 2022-02-01 13:20:28 -05:00
follow.yml Fix user visible check (#21210) 2022-09-20 15:59:20 +08:00
gpg_key.yml Fix verifyCommits error when push a new branch (#26664) 2023-08-30 02:27:53 +00:00
gpg_key_import.yml add .gpg url (match github behaviour) (#6610) 2019-04-14 12:43:56 -04:00
hook_task.yml Decouple HookTask from Repository (#17940) 2022-10-21 18:21:56 +02:00
issue.yml Fix comment permissions (#28213) 2023-11-25 17:21:21 +00:00
issue_assignees.yml Fix issue overview for teams (#19652) 2022-05-16 17:49:17 +08:00
issue_index.yml Fix issue overview for teams (#19652) 2022-05-16 17:49:17 +08:00
issue_label.yml Add Organization Wide Labels (#10814) 2020-04-01 01:14:46 -03:00
issue_user.yml [API] ListIssues add more filters (#16174) 2021-06-16 18:33:37 -04:00
issue_watch.yml Refactor Issues Subscription (#8738) 2019-11-20 22:50:54 +08:00
label.yml Allow to archive labels (#26478) 2023-08-14 11:56:14 +02:00
lfs_meta_object.yml Test views of LFS files (#22196) 2022-12-23 07:41:56 +08:00
login_source.yml Add LDAP integration tests (#3897) 2018-05-11 15:55:32 +08:00
milestone.yml Add some api integration tests (#18872) 2022-10-18 00:23:27 +08:00
mirror.yml Fix bug of branches API with tests (#25578) 2023-07-01 10:52:52 +08:00
notice.yml Unit tests for models/admin 2017-01-09 21:49:51 +01:00
notification.yml [API] Add notification endpoint (#9488) 2020-01-09 11:56:32 +00:00
oauth2_application.yml Record OAuth client type at registration (#21316) 2022-10-24 15:59:24 +08:00
oauth2_authorization_code.yml Record OAuth client type at registration (#21316) 2022-10-24 15:59:24 +08:00
oauth2_grant.yml Record OAuth client type at registration (#21316) 2022-10-24 15:59:24 +08:00
org_user.yml Revert package access change from #23879 (#25707) 2023-07-09 13:00:07 +00:00
project.yml Fix incorrect oldest sort in project list (#25806) 2023-07-11 20:47:50 +02:00
project_board.yml Support org/user level projects (#22235) 2023-01-20 19:42:33 +08:00
project_issue.yml Kanban board (#8346) 2020-08-16 23:07:38 -04:00
protected_branch.yml Don't recreate database in integration tests (#1697) 2017-05-11 23:32:43 +08:00
public_key.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
pull_request.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
reaction.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
release.yml Allow get release download files and lfs files with oauth2 token format (#26430) 2023-10-01 10:41:52 +00:00
renamed_branch.yml Add a simple way to rename branch like gh (#15870) 2021-10-08 19:03:04 +02:00
repo_archiver.yml Rework repository archive (#14723) 2021-06-23 17:12:38 -04:00
repo_indexer_status.yml Code/repo search (#2582) 2017-10-27 09:10:54 +03:00
repo_redirect.yml Unit tests for repo redirects (#961) 2017-02-17 08:55:33 +08:00
repo_topic.yml Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
repo_transfer.yml Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
repo_unit.yml Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
repository.yml Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
review.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
star.yml Unit tests for models/star (#752) 2017-01-25 18:37:10 +08:00
stopwatch.yml [API] extend StopWatch (#9196) 2019-12-11 23:23:05 -05:00
system_setting.yml Fix context cache bug & enable context cache for dashabord commits' authors (#26991) 2023-09-11 10:14:01 +00:00
team.yml Fix review request number and add more tests (#27104) 2023-09-21 13:59:50 +02:00
team_repo.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
team_unit.yml Fix access check for org-level project (#26182) 2023-07-29 14:13:24 +00:00
team_user.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
topic.yml Add some api integration tests (#18872) 2022-10-18 00:23:27 +08:00
tracked_time.yml [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
two_factor.yml org/members: display 2FA members states + optimize sql requests (#7621) 2019-08-02 12:06:27 -04:00
user.yml Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
user_open_id.yml Show user OpenID URIs in their profile (#1314) 2017-03-20 09:31:08 +01:00
user_redirect.yml Redirect on changed user and org name (#11649) 2021-01-24 16:23:05 +01:00
watch.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
webauthn_credential.yml Add some api integration tests (#18872) 2022-10-18 00:23:27 +08:00
webhook.yml Add user webhooks (#21563) 2023-03-10 08:28:32 -06:00