From 9645f6426c043337e214a392c23d0d3a6c36c67a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 2 Sep 2022 10:16:26 +0800 Subject: [PATCH] =?UTF-8?q?:loud=5Fsound:=20=E7=BB=86=E5=8C=96=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index d35250d7e..d2f6684bf 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -633,6 +633,10 @@ func syncRepo(boot, exit, byHand bool) (err error) { } func logSyncMergeResult(mergeResult *dejavu.MergeResult) { + if 1 > len(mergeResult.Conflicts) && 1 > len(mergeResult.Upserts) && 1 > len(mergeResult.Removes) { + return + } + logging.LogInfof("sync merge result [conflicts=%d, upserts=%d, removes=%d]", len(mergeResult.Conflicts), len(mergeResult.Upserts), len(mergeResult.Removes)) if 0 < len(mergeResult.Conflicts) { logBuilder := bytes.Buffer{}