Git with a cup of tea, painless self-hosted git service Mirror for internal git.with.parts use https://git.with.parts

You can not 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 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 ```		10 months ago
..
access.yml	Fix more yaml lint errors (#27284)	1 year ago
access_token.yml	Fix more yaml lint errors (#27284)	1 year ago
action.yml	…
action_run.yml	…
action_run_job.yml	…
action_runner_token.yml	Add unit tests for action runner token (#27670)	1 year ago
action_task.yml	…
attachment.yml	Allow get release download files and lfs files with oauth2 token format (#26430)	1 year ago
branch.yml	…
collaboration.yml	…
comment.yml	Fix comment permissions (#28213)	1 year ago
commit_status.yml	…
commit_status_index.yml	Fix more yaml lint errors (#27284)	1 year ago
deploy_key.yml	…
email_address.yml	Replace 'userxx' with 'orgxx' in all test files when the user type is org (#27052)	1 year ago
external_login_user.yml	…
follow.yml	…
gpg_key.yml	Fix verifyCommits error when push a new branch (#26664)	1 year ago
gpg_key_import.yml	…
hook_task.yml	…
issue.yml	Fix comment permissions (#28213)	1 year ago
issue_assignees.yml	…
issue_index.yml	…
issue_label.yml	…
issue_user.yml	…
issue_watch.yml	…
label.yml	Allow to archive labels (#26478)	1 year ago
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	Fix more yaml lint errors (#27284)	1 year ago
pull_request.yml	Fix more yaml lint errors (#27284)	1 year ago
reaction.yml	Fix more yaml lint errors (#27284)	1 year ago
release.yml	Allow get release download files and lfs files with oauth2 token format (#26430)	1 year ago
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)	10 months ago
repository.yml	Fix reverting a merge commit failing (#28794)	10 months ago
review.yml	Fix more yaml lint errors (#27284)	1 year ago
star.yml	…
stopwatch.yml	…
system_setting.yml	Fix context cache bug & enable context cache for dashabord commits' authors (#26991)	1 year ago
team.yml	Fix review request number and add more tests (#27104)	1 year ago
team_repo.yml	Fix more yaml lint errors (#27284)	1 year ago
team_unit.yml	…
team_user.yml	Fix more yaml lint errors (#27284)	1 year ago
topic.yml	…
tracked_time.yml	…
two_factor.yml	…
user.yml	Fix reverting a merge commit failing (#28794)	10 months ago
user_open_id.yml	…
user_redirect.yml	…
watch.yml	Fix more yaml lint errors (#27284)	1 year ago
webauthn_credential.yml	…
webhook.yml	…