forgejo/models/fixtures
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
comment.yml Fix comment permissions (#28213) 2023-11-25 17:21:21 +00:00
commit_status.yml
commit_status_index.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
deploy_key.yml
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
follow.yml
gpg_key.yml Fix verifyCommits error when push a new branch (#26664) 2023-08-30 02:27:53 +00:00
gpg_key_import.yml
hook_task.yml
issue.yml Fix comment permissions (#28213) 2023-11-25 17:21:21 +00:00
issue_assignees.yml
issue_index.yml
issue_label.yml
issue_user.yml
issue_watch.yml
label.yml Allow to archive labels (#26478) 2023-08-14 11:56:14 +02:00
lfs_meta_object.yml
login_source.yml
milestone.yml
mirror.yml Fix bug of branches API with tests (#25578) 2023-07-01 10:52:52 +08:00
notice.yml
notification.yml
oauth2_application.yml
oauth2_authorization_code.yml
oauth2_grant.yml
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
project_issue.yml
protected_branch.yml
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
repo_archiver.yml
repo_indexer_status.yml
repo_redirect.yml
repo_topic.yml
repo_transfer.yml
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
stopwatch.yml
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
tracked_time.yml
two_factor.yml
user.yml Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
user_open_id.yml
user_redirect.yml
watch.yml Fix more yaml lint errors (#27284) 2023-09-26 12:56:42 -04:00
webauthn_credential.yml
webhook.yml Add user webhooks (#21563) 2023-03-10 08:28:32 -06:00