forked from gitea/gitea
1
0
Fork 0
gitea/options
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
..
gitignore Update gitignore list (#5258) 2018-11-03 18:06:09 -04:00
label Add label descriptions (#3662) 2018-03-13 10:03:55 +08:00
license Update licenses (#8752) 2019-10-30 16:19:14 +00:00
locale Adjust error reporting from merge failures and use LC_ALL=C for git (#8548) 2019-11-10 08:42:51 +00:00
readme Bindata is optional and over-writable on restart (#354) 2016-12-22 19:12:23 +01:00