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

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.

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

53 KiB

Raw Blame History

View Raw