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
..
2019-08-23 12:40:29 -04:00
2019-10-17 11:26:49 +02:00
2019-06-12 15:41:28 -04:00
2019-09-24 21:22:39 +08:00
2019-10-17 11:26:49 +02:00
2019-10-17 11:26:49 +02:00
2019-10-17 11:26:49 +02:00
2019-10-17 11:26:49 +02:00
2019-10-17 10:06:28 +08:00
2019-06-12 15:41:28 -04:00
2019-10-17 11:26:49 +02:00
2019-08-23 12:40:29 -04:00
2019-10-17 11:26:49 +02:00
2019-11-08 17:21:00 -05:00
2019-06-12 15:41:28 -04:00
2019-10-17 11:26:49 +02:00
2019-08-23 12:40:29 -04:00
2019-06-12 15:41:28 -04:00
2019-06-12 15:41:28 -04:00
2018-10-20 18:19:21 -04:00