domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Added auto-save whitespace behavior if it changed manually (#15566)

Browse source
This commit is contained in:
Viktor Suprun 2022-02-08 17:15:04 +11:00 • committed by GitHub
parent 60f203385e
commit 4d939845d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/gitdiff/gitdiff.go
View file

@ -1532,13 +1532,17 @@ func CommentMustAsDiff(c *models.Comment) *Diff {
}
// GetWhitespaceFlag returns git diff flag for treating whitespaces
func GetWhitespaceFlag(whiteSpaceBehavior string) string {
func GetWhitespaceFlag(whitespaceBehavior string) string {
whitespaceFlags := map[string]string{
"ignore-all": "-w",
"ignore-change": "-b",
"ignore-eol": "--ignore-space-at-eol",
"": "",
"show-all": "",
}
return whitespaceFlags[whiteSpaceBehavior]
if flag, ok := whitespaceFlags[whitespaceBehavior]; ok {
return flag
}
log.Warn("unknown whitespace behavior: %q, default to 'show-all'", whitespaceBehavior)
return ""
}