From b921569b72886225e94a6650fb4472f31d28fe6d Mon Sep 17 00:00:00 2001 From: tamakyi Date: Wed, 9 Sep 2026 12:49:44 +0800 Subject: [PATCH] =?UTF-8?q?git-sync-web=20=E8=87=AA=E5=8A=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=202026-09-09=2012:49:43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/engine.go b/engine.go index 70da0f3..89c47a0 100644 --- a/engine.go +++ b/engine.go @@ -1405,11 +1405,12 @@ func (e *Engine) WorkingDiff(name, scope string) (*DiffResult, error) { statArgs = append(statArgs, "--stat") } if statOut, serr := gitRun(s.cfg.RepoPath, 30*time.Second, statArgs...); serr == nil { + statOut = stripWarnings(statOut) res.Stat = statOut res.Files = parseStatFiles(statOut) } if textOut, terr := gitRun(s.cfg.RepoPath, 60*time.Second, args...); terr == nil { - res.Text = textOut + res.Text = stripWarnings(textOut) } else { res.Text = terr.Error() } @@ -1419,6 +1420,19 @@ func (e *Engine) WorkingDiff(name, scope string) (*DiffResult, error) { return res, nil } +// stripWarnings 去掉 git 在 stderr 输出的环境告警(如 autocrlf 提示),避免污染差异展示 +func stripWarnings(s string) string { + lines := strings.Split(s, "\n") + out := make([]string, 0, len(lines)) + for _, l := range lines { + if strings.HasPrefix(l, "warning:") { + continue + } + out = append(out, l) + } + return strings.Join(out, "\n") +} + // parseStatFiles 解析 `git diff --stat` 输出为单文件增删统计 func parseStatFiles(stat string) []DiffFile { var files []DiffFile