1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-22 15:44:27 +00:00
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-08-23 12:40:29 -04:00
2019-10-07 01:49:14 -04:00
2019-10-23 16:32:19 +01:00
2019-08-23 12:40:29 -04:00
2019-06-12 15:41:28 -04:00
2019-09-17 12:39:37 +03:00
2018-11-04 22:20:00 -05:00
2019-08-23 12:40:29 -04:00
2019-06-12 15:41:28 -04:00
2019-08-23 12:40:29 -04:00
2018-03-16 22:04:33 +08:00
2019-03-08 11:42:50 -05:00
2019-08-23 12:40:29 -04:00
2019-08-23 12:40:29 -04:00
2019-08-23 12:40:29 -04:00
2019-08-23 12:40:29 -04:00
2019-08-17 13:10:17 +03:00
2019-06-12 15:41:28 -04:00