Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)

Browse Source

There are two major components to this PR:

* This PR handles merge and rebase failures from merging a little more nicely with Flash errors rather a 500.
* All git commands are run in the LC_ALL="C" environment to ensure that error messages are in English. This DefaultLocale is defined in a way that if necessary (due to platform weirdness) it can be overridden at build time using LDFLAGS="-X "code.gitea.io/gitea/modules/git.DefaultLocale=C"" with C changed for the locale as necessary.

...

This commit is contained in:

zeripath

2019-11-10 08:42:51 +00:00

committed by GitHub

parent 31416a5f4e

commit 8eeb2877d5

7 changed files with 483 additions and 95 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

311

services/pull/merge.go

File diff suppressed because it is too large Load Diff