mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-28 10:24:11 -05:00
b8270240bf
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.
|
||
|---|---|---|
| .. | ||
| access.yml | ||
| access_token.yml | ||
| action.yml | ||
| action_run.yml | ||
| action_run_job.yml | ||
| action_runner_token.yml | ||
| action_task.yml | ||
| attachment.yml | ||
| branch.yml | ||
| collaboration.yml | ||
| comment.yml | ||
| commit_status.yml | ||
| commit_status_index.yml | ||
| deploy_key.yml | ||
| email_address.yml | ||
| external_login_user.yml | ||
| follow.yml | ||
| gpg_key.yml | ||
| gpg_key_import.yml | ||
| hook_task.yml | ||
| issue.yml | ||
| issue_assignees.yml | ||
| issue_index.yml | ||
| issue_label.yml | ||
| issue_user.yml | ||
| issue_watch.yml | ||
| label.yml | ||
| lfs_meta_object.yml | ||
| login_source.yml | ||
| milestone.yml | ||
| mirror.yml | ||
| notice.yml | ||
| notification.yml | ||
| oauth2_application.yml | ||
| oauth2_authorization_code.yml | ||
| oauth2_grant.yml | ||
| org_user.yml | ||
| project.yml | ||
| project_board.yml | ||
| project_issue.yml | ||
| protected_branch.yml | ||
| public_key.yml | ||
| pull_request.yml | ||
| reaction.yml | ||
| release.yml | ||
| renamed_branch.yml | ||
| repo_archiver.yml | ||
| repo_indexer_status.yml | ||
| repo_redirect.yml | ||
| repo_topic.yml | ||
| repo_transfer.yml | ||
| repo_unit.yml | ||
| repository.yml | ||
| review.yml | ||
| star.yml | ||
| stopwatch.yml | ||
| system_setting.yml | ||
| team.yml | ||
| team_repo.yml | ||
| team_unit.yml | ||
| team_user.yml | ||
| topic.yml | ||
| tracked_time.yml | ||
| two_factor.yml | ||
| user.yml | ||
| user_open_id.yml | ||
| user_redirect.yml | ||
| watch.yml | ||
| webauthn_credential.yml | ||
| webhook.yml | ||