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
..
blob.go
branch.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
collaborators.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
commits.go
file.go
fork.go
git_hook.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
git_ref.go
hook.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
hook_test.go
issue.go
issue_comment.go
issue_label.go
issue_subscription.go
issue_tracked_time.go
key.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
label.go
main_test.go
milestone.go
pull.go	Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)	2019-11-10 08:42:51 +00:00
release.go
release_attachment.go
repo.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
repo_test.go
star.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
status.go
subscriber.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
tag.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
topic.go	Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)	2019-11-10 12:41:51 +08:00
tree.go