No description
Find a file
Mihir Joshi 62f2d717b7
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
```
2024-01-21 14:18:37 +00:00
.devcontainer devpod use go1.21 (#26637) 2023-08-21 16:20:50 +00:00
.gitea Use docs.gitea.com instead of docs.gitea.io (#26739) 2023-08-27 11:59:12 +00:00
.github Fix Docker meta action for releases (#28232) (#28395) 2023-12-07 16:29:17 -08:00
assets bump go-deps (#27489) (#27493) 2023-10-08 00:07:09 +00:00
build Use Set[Type] instead of map[Type]bool/struct{}. (#26804) 2023-08-30 06:55:25 +00:00
cmd Improve doctor cli behavior (#28422) (#28424) 2023-12-11 16:28:27 +00:00
contrib Suggest to use Type=simple for systemd service (#28717) (#28722) 2024-01-07 16:42:43 +01:00
custom/conf Improve document for ARTIFACT_RETENTION_DAYS (#28646) (#28648) 2023-12-29 15:39:59 +08:00
docker Dockerfile small refactor (#27757) (#27826) 2023-10-29 13:20:54 +01:00
docs Improve frontend guideline (#28711) (#28713) 2024-01-06 12:30:36 -05:00
models Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00:00
modules Remove duplicated checkinit on git module (#28824) (#28831) 2024-01-17 10:16:33 +00:00
options Forbid removing the last admin user (#28337) (#28793) 2024-01-16 01:51:46 +00:00
public Update JS and Poetry dependencies and eslint (#27200) (#27201) 2023-09-22 21:26:42 +00:00
routers Rework markup link rendering (#26745) (#28803) 2024-01-16 02:13:29 +00:00
services Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00: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-17 01:35:26 +01:00
tests Fix reverting a merge commit failing (#28794) (#28825) 2024-01-21 14:18:37 +00:00
web_src Modernize merge button (#28140) (#28786) 2024-01-15 09:40:52 +08: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 Move public asset files to the proper directory (#25907) 2023-07-18 18:06:43 +02:00
.gitignore update snap package (#27021) 2023-09-12 12:47:53 +00: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-17 10:46:50 +08:00
CODE_OF_CONDUCT.md Add Gitea Community Code of Conduct (#23188) 2023-03-09 10:49:34 +08:00
CONTRIBUTING.md Use docs.gitea.com instead of docs.gitea.io (#26739) 2023-08-27 11:59:12 +00:00
DCO Remove address from DCO (#22595) 2023-01-24 18:52:38 +00:00
Dockerfile Dockerfile small refactor (#27757) (#27826) 2023-10-29 13:20:54 +01:00
Dockerfile.rootless Dockerfile small refactor (#27757) (#27826) 2023-10-29 13:20:54 +01:00
go.mod Update github.com/cloudflare/circl (#28789) (#28790) 2024-01-15 13:19:18 +08:00
go.sum Update github.com/cloudflare/circl (#28789) (#28790) 2024-01-15 13:19:18 +08:00
LICENSE Fix typo 2016-11-08 08:42:05 +01:00
main.go Fix incorrect CLI exit code and duplicate error message (#26346) 2023-08-05 23:36:45 +08:00
MAINTAINERS Apply lng2020 to maintainers (#27068) 2023-09-14 12:10:12 +08:00
Makefile Install poetry dependencies with --no-root (#27919) (#27920) 2023-11-06 02:14:46 +00:00
package-lock.json Bump @github/relative-time-element to 4.3.1 (#28819) (#28826) 2024-01-17 17:52:06 +08:00
package.json Bump @github/relative-time-element to 4.3.1 (#28819) (#28826) 2024-01-17 17:52:06 +08: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 Update JS and Poetry dependencies and eslint (#27200) (#27201) 2023-09-22 21:26:42 +00:00
README.md rm comment about hugo (#26832) 2023-08-31 01:09:11 +00:00
README_ZH.md Use docs.gitea.com instead of docs.gitea.io (#26739) 2023-08-27 11:59:12 +00:00
SECURITY.md Link to list of vulnerabilities (#25872) 2023-07-14 01:26:54 +00:00
vitest.config.js Use vitest globals (#27102) (#27311) 2023-09-27 16:10:08 +02:00
webpack.config.js Enable production source maps for index.js, fix CSS sourcemaps (#27291) (#27295) 2023-09-27 04:26:28 +02:00

Gitea

Gitea - Git with a cup of tea

Contribute with Gitpod

View this document in Chinese

Purpose

The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service.

As Gitea is written in Go, it works across all the platforms and architectures that are supported by Go, including Linux, macOS, and Windows on x86, amd64, ARM and PowerPC architectures. You can try it out using the online demo. This project has been forked from Gogs since November of 2016, but a lot has changed.

Building

From the root of the source tree, run:

TAGS="bindata" make build

or if SQLite support is required:

TAGS="bindata sqlite sqlite_unlock_notify" make build

The build target is split into two sub-targets:

  • make backend which requires Go Stable, the required version is defined in go.mod.
  • make frontend which requires Node.js LTS or greater.

Internet connectivity is required to download the go and npm modules. When building from the official source tarballs which include pre-built frontend files, the frontend target will not be triggered, making it possible to build without Node.js.

Parallelism (make -j <num>) is not supported.

More info: https://docs.gitea.com/installation/install-from-source

Using

./gitea web

NOTE: If you're interested in using our APIs, we have experimental support with documentation.

Contributing

Expected workflow is: Fork -> Patch -> Push -> Pull Request

NOTES:

  1. YOU MUST READ THE CONTRIBUTORS GUIDE BEFORE STARTING TO WORK ON A PULL REQUEST.
  2. If you have found a vulnerability in the project, please write privately to security@gitea.io. Thanks!

Translating

Translations are done through Crowdin. If you want to translate to a new language ask one of the managers in the Crowdin project to add a new language there.

You can also just create an issue for adding a language or ask on discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty but we hope to fill it as questions pop up.

https://docs.gitea.com/contributing/localization

Crowdin

Further information

For more information and instructions about how to install Gitea, please look at our documentation. If you have questions that are not covered by the documentation, you can get in contact with us on our Discord server or create a post in the discourse forum.

We maintain a list of Gitea-related projects at gitea/awesome-gitea.

The official Gitea CLI is developed at gitea/tea.

Authors

Backers

Thank you to all our backers! 🙏 [Become a backer]

Sponsors

Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor]

FAQ

How do you pronounce Gitea?

Gitea is pronounced /ɡɪti:/ as in "gi-tea" with a hard g.

Why is this not hosted on a Gitea instance?

We're working on it.

License

This project is licensed under the MIT License. See the LICENSE file for the full license text.

Screenshots

Looking for an overview of the interface? Check it out!

Dashboard User Profile Global Issues
Branches Web Editor Activity
New Migration Migrating Pull Request View
Pull Request Dark Diff Review Dark Diff Dark