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	Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... (#23874)	2 years ago
action_run.yml	Implement actions artifacts (#22738)	2 years ago
action_run_job.yml	Implement actions artifacts (#22738)	2 years ago
action_runner_token.yml	Add unit tests for action runner token (#27670)	1 year ago
action_task.yml	Implement actions artifacts (#22738)	2 years ago
attachment.yml	Allow get release download files and lfs files with oauth2 token format (#26430)	1 year ago
branch.yml	Sync branches into databases (#22743)	1 year ago
collaboration.yml	Fix "access" fixtures and tests (#10247)	5 years ago
comment.yml	Fix comment permissions (#28213)	1 year ago
commit_status.yml	Status-API (#1332)	8 years ago
commit_status_index.yml	Fix more yaml lint errors (#27284)	1 year ago
deploy_key.yml	Writable deploy keys (closes #671) (#3225)	7 years ago
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	add test coverage for original author conversion during migrations (#18506)	3 years ago
follow.yml	Fix user visible check (#21210)	2 years ago
gpg_key.yml	Fix verifyCommits error when push a new branch (#26664)	1 year ago
gpg_key_import.yml	add .gpg url (match github behaviour) (#6610)	6 years ago
hook_task.yml	Decouple HookTask from Repository (#17940)	2 years ago
issue.yml	Fix comment permissions (#28213)	1 year ago
issue_assignees.yml	Fix issue overview for teams (#19652)	3 years ago
issue_index.yml	Fix issue overview for teams (#19652)	3 years ago
issue_label.yml	Add Organization Wide Labels (#10814)	5 years ago
issue_user.yml	[API] ListIssues add more filters (#16174)	3 years ago
issue_watch.yml	Refactor Issues Subscription (#8738)	5 years ago
label.yml	Allow to archive labels (#26478)	1 year ago
lfs_meta_object.yml	Test views of LFS files (#22196)	2 years ago
login_source.yml	Add LDAP integration tests (#3897)	7 years ago
milestone.yml	Add some api integration tests (#18872)	2 years ago
mirror.yml	Fix bug of branches API with tests (#25578)	1 year ago
notice.yml	…
notification.yml	[API] Add notification endpoint (#9488)	5 years ago
oauth2_application.yml	Record OAuth client type at registration (#21316)	2 years ago
oauth2_authorization_code.yml	Record OAuth client type at registration (#21316)	2 years ago
oauth2_grant.yml	Record OAuth client type at registration (#21316)	2 years ago
org_user.yml	Revert package access change from #23879 (#25707)	1 year ago
project.yml	Fix incorrect oldest sort in project list (#25806)	1 year ago
project_board.yml	Support org/user level projects (#22235)	2 years ago
project_issue.yml	Kanban board (#8346)	4 years ago
protected_branch.yml	Don't recreate database in integration tests (#1697)	8 years ago
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	Add a simple way to rename branch like gh (#15870)	3 years ago
repo_archiver.yml	Rework repository archive (#14723)	3 years ago
repo_indexer_status.yml	Code/repo search (#2582)	7 years ago
repo_redirect.yml	…
repo_topic.yml	Add API endpoint for accessing repo topics (#7963)	5 years ago
repo_transfer.yml	Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)	4 years ago
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	[API] extend StopWatch (#9196)	5 years ago
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	Fix access check for org-level project (#26182)	1 year ago
team_user.yml	Fix more yaml lint errors (#27284)	1 year ago
topic.yml	Add some api integration tests (#18872)	2 years ago
tracked_time.yml	[API] Extend times API (#9200)	5 years ago
two_factor.yml	org/members: display 2FA members states + optimize sql requests (#7621)	5 years ago
user.yml	Fix reverting a merge commit failing (#28794)	10 months ago
user_open_id.yml	…
user_redirect.yml	Redirect on changed user and org name (#11649)	4 years ago
watch.yml	Fix more yaml lint errors (#27284)	1 year ago
webauthn_credential.yml	Add some api integration tests (#18872)	2 years ago
webhook.yml	Add user webhooks (#21563)	2 years ago