1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 12:59:11 -05:00
Beyond coding. We forge. (Code of Conduct: https://codeberg.org/forgejo/code-of-conduct) https://forgejo.org/
Find a file
Mihir Joshi 54a6dc73ef
Fix reverting a merge commit failing (#28794) (#28825)
Backport https://github.com/go-gitea/gitea/pull/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:
```bash
$ git update-index --refresh
$ git read-tree -m 1f085d7ed8 1f085d7ed8 9933caed00
```

(cherry picked from commit 62f2d717b7)
2024-01-31 14:18:25 +01:00
.devcontainer devpod use go1.21 (#26637) 2023-08-21 16:20:50 +00:00
.forgejo [CI] Forgejo Actions based release process (squash) no ownca 2023-12-28 17:27:34 +01:00
.gitea [WORKFLOW] yaml issue templates 2023-11-13 12:33:49 +01:00
.github Fix Docker meta action for releases (#28232) (#28395) 2023-12-08 13:41:16 +01:00
assets [GITEA] Use maintained gziphandler 2024-01-16 14:09:55 +00:00
build [I18N] Add Locale merger script (squash) abort on NOOP 2023-11-28 17:52:11 +01:00
cmd fixed duplicate attachments on dump on windows (#28019) (#28031) 2023-11-22 17:11:57 +01:00
contrib [BRANDING] parse FORGEJO__* in the container environment 2023-11-13 14:00:15 +01:00
custom/conf Refactor CORS handler (#28587) (#28611) 2024-01-16 14:08:38 +00:00
docker [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2023-11-13 13:58:17 +01:00
docs Improve frontend guideline (#28711) (#28713) 2024-01-16 14:16:56 +00:00
models [MODERATION] Refactor excluding watchers mechanism (squash) 2024-01-22 21:01:08 +01:00
modules Remove duplicated checkinit on git module (#28824) (#28831) 2024-01-31 13:36:08 +01:00
options Forbid removing the last admin user (#28337) (#28793) 2024-01-16 14:41:11 +00:00
public [BRANDING] security.txt 2023-11-13 14:01:11 +01:00
releases/images [DOCS] RELEASE-NOTES.md 2023-11-13 12:33:48 +01:00
routers [GITEA] Fix NPE in UsernameSubRoute 2024-01-18 15:31:04 +01:00
services Fix reverting a merge commit failing (#28794) (#28825) 2024-01-31 14:18:25 +01:00
snap set version in snapcraft yaml 2023-09-13 23:20:46 -04:00
templates Render code block in activity tab (#28816) (#28818) 2024-01-31 13:35:54 +01:00
tests [MODERATION] Refactor excluding watchers mechanism (squash) 2024-01-22 21:01:08 +01:00
web_src Modernize merge button (#28140) (#28786) 2024-01-16 14:40:18 +00:00
.air.toml Reduce verbosity of dev commands (#24917) 2023-05-24 20:11:04 +00:00
.changelog.yml Adapt .changelog.yml to new labeling system (#27701) (#27702) 2023-10-20 00:29:50 +02:00
.dockerignore Move public asset files to the proper directory (#25907) 2023-07-18 18:06:43 +02:00
.editorconfig Add markdownlint (#20512) 2022-07-28 09:22:47 +08:00
.eslintrc.yaml Update JS and PY dependencies (#27501) (#27518) 2023-10-08 19:31:33 +02:00
.gitattributes [META] Use correct language for .tmpl 2023-11-13 12:33:48 +01:00
.gitignore [I18N] Makefile + gitignore 2023-11-13 13:57:47 +01:00
.gitpod.yml Add Github related extensions in devcontainer (#25800) 2023-07-14 15:58:02 +08:00
.golangci.yml Use Go 1.21 for golangci-lint (#26786) 2023-08-29 16:25:24 +02:00
.ignore Add /public/assets to .ignore (#26232) 2023-07-30 12:34:20 +02:00
.markdownlint.yaml Enable markdownlint no-duplicate-header (#27500) (#27506) 2023-10-07 21:41:41 +08:00
.npmrc Upgrade to npm lockfile v3 and explicitely set it (#23561) 2023-03-18 19:38:10 +01:00
.spectral.yaml Add spectral linter for Swagger (#20321) 2022-07-11 18:07:16 -05:00
.stylelintrc.yaml Update JS dependencies (#26025) 2023-07-21 11:34:10 +08:00
.yamllint.yaml fully replace drone with actions (#27556) (#27575) 2023-10-11 12:03:06 +00:00
BSDmakefile Fix build errors on BSD (in BSDMakefile) (#27594) (#27608) 2023-10-14 07:29:55 +00:00
build.go User/Org Feed render description as per web (#23887) 2023-04-04 04:39:47 +01:00
CHANGELOG.md Add changelog for 1.21.4 (#28812) 2024-01-31 13:35:57 +01:00
CODEOWNERS [META] Add CODEOWNERS files 2023-11-13 12:33:49 +01:00
CONTRIBUTING.md [DOCS] CONTRIBUTING 2023-11-13 12:33:47 +01:00
DCO Remove address from DCO (#22595) 2023-01-24 18:52:38 +00:00
Dockerfile [CI] Forgejo Actions based release process (squash) gitea to forgejo 2023-11-13 13:58:18 +01:00
Dockerfile.rootless [CI] Forgejo Actions based release process (squash) gitea to forgejo 2023-11-13 13:58:18 +01:00
go.mod Update github.com/cloudflare/circl (#28789) (#28790) 2024-01-16 14:40:56 +00:00
go.sum Update github.com/cloudflare/circl (#28789) (#28790) 2024-01-16 14:40:56 +00:00
LICENSE [DOCS] LICENSE: add Forgejo Authors 2023-11-13 12:33:48 +01:00
main.go [BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR} 2023-11-13 13:58:18 +01:00
MAINTAINERS Apply lng2020 to maintainers (#27068) 2023-09-14 12:10:12 +08:00
Makefile [SEMVER] 6.0.4+0-gitea-1.21.4 2024-01-16 14:44:21 +00:00
package-lock.json Bump @github/relative-time-element to 4.3.1 (#28819) (#28826) 2024-01-31 13:36:02 +01:00
package.json Bump @github/relative-time-element to 4.3.1 (#28819) (#28826) 2024-01-31 13:36:02 +01:00
playwright.config.js Update JS dependencies and eslint config (#21388) 2022-10-10 20:02:20 +08:00
poetry.lock Update JS and PY dependencies (#27501) (#27518) 2023-10-08 19:31:33 +02:00
poetry.toml Clean up pyproject.toml and package.json, fix poetry options (#25327) 2023-06-18 18:13:08 +00:00
pyproject.toml [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2023-11-13 13:58:17 +01:00
README.md [BRANDING] add Forgejo logo 2023-11-13 13:58:17 +01:00
RELEASE-NOTES.md [DOCS] RELEASE-NOTES.md 2023-11-13 12:33:48 +01:00
vitest.config.js Use vitest globals (#27102) (#27311) 2023-09-27 16:10:08 +02:00
webpack.config.js [API] Forgejo API /api/forgejo/v1 2023-11-13 12:33:48 +01:00

Welcome to Forgejo

Hi there! Tired of big platforms playing monopoly? Providing Git hosting for your project, friends, company or community? Forgejo (/for'd͡ʒe.jo/ inspired by forĝejo the Esperanto word for forge) has you covered with its intuitive interface, light and easy hosting and a lot of builtin functionality.

Forgejo was created in 2022 because we think that the project should be owned by an independent community. If you second that, then Forgejo is for you! Our promise: Independent Free/Libre Software forever!

What does Forgejo offer?

If you like any of the following, Forgejo is literally meant for you:

  • Lightweight: Forgejo can easily be hosted on nearly every machine. Running on a Raspberry? Small cloud instance? No problem!
  • Project management: Besides Git hosting, Forgejo offers issues, pull requests, wikis, kanban boards and much more to coordinate with your team.
  • Publishing: Have something to share? Use releases to host your software for download, or use the package registry to publish it for docker, npm and many other package managers.
  • Customizable: Want to change your look? Change some settings? There are many config switches to make Forgejo work exactly like you want.
  • Powerful: Organizations & team permissions, CI integration, Code Search, LDAP, OAuth and much more. If you have advanced needs, Forgejo has you covered.
  • Privacy: From update checker to default settings: Forgejo is built to be privacy first for you and your crew.
  • Federation: (WIP) We are actively working to connect software forges with each other through ActivityPub, and create a collaborative network of personal instances.

Learn more

Dive into the documentation, subscribe to releases and blog post on our website, find us on the Fediverse or hop into our Matrix room if you have any questions or want to get involved.

Get involved

If you are interested in making Forgejo better, either by reporting a bug or by changing the governance, please take a look at the contribution guide.