diff --git a/modules/git/hooks.go b/modules/git/hooks.go index b8d15e5e75..5b3c88a931 100644 --- a/modules/git/hooks.go +++ b/modules/git/hooks.go @@ -83,7 +83,7 @@ func (h *Hook) Update() error { if len(strings.TrimSpace(h.Content)) == 0 { return os.Remove(h.path) } - return ioutil.WriteFile(h.path, []byte(h.Content), os.ModePerm) + return ioutil.WriteFile(h.path, []byte(strings.Replace(h.Content, "\r", "", -1)), os.ModePerm) } // ListHooks returns a list of Git hooks of given repository. diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 30a983ac90..9dac1cac97 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -74,7 +74,7 @@ {{range .Diff.Files}} -