From 5a1f6cb813788daac21eddbb58f9071fbaa8e9a4 Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Mon, 2 Aug 2021 05:44:49 +0900 Subject: [PATCH] lib/fs: Improve case conflict error message (fixes #7827) (#7829) --- lib/fs/casefs.go | 2 +- lib/model/folder_sendrecv_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fs/casefs.go b/lib/fs/casefs.go index aebf4b9fd..ffbd371e8 100644 --- a/lib/fs/casefs.go +++ b/lib/fs/casefs.go @@ -29,7 +29,7 @@ type ErrCaseConflict struct { } func (e *ErrCaseConflict) Error() string { - return fmt.Sprintf(`given name "%v" differs from name in filesystem "%v"`, e.Given, e.Real) + return fmt.Sprintf(`remote "%v" uses different upper or lowercase characters than local "%v"; change the casing on either side to match the other`, e.Given, e.Real) } func IsErrCaseConflict(err error) bool { diff --git a/lib/model/folder_sendrecv_test.go b/lib/model/folder_sendrecv_test.go index 38f86b39a..2894fe14f 100644 --- a/lib/model/folder_sendrecv_test.go +++ b/lib/model/folder_sendrecv_test.go @@ -1203,7 +1203,7 @@ func testPullCaseOnlyDirOrSymlink(t *testing.T, dir bool) { } if errStr, ok := f.tempPullErrors[remote.Name]; !ok { t.Error("missing error for", remote.Name) - } else if !strings.Contains(errStr, "differs from name") { + } else if !strings.Contains(errStr, "uses different upper or lowercase") { t.Error("unexpected error", errStr, "for", remote.Name) } }