From ec219b27d4eec284e8b54110dfdd89df93890f04 Mon Sep 17 00:00:00 2001 From: Chris Darroch Date: Thu, 27 Jan 2022 09:31:41 -0800 Subject: [PATCH] commands,t: use Git LFS project name in messages We convert a few messages output by the various commands to use the full "Git LFS" project name instead of the shorter "LFS" variant, which will make them consistent with how the project name appears in other messages elsewhere. Note that we leave the status messages in the transfer queue using the shorter variant as they are intended to be brief, are checked extensively in the test suite, and are familiar to users at this point. --- commands/command_clean.go | 2 +- commands/lockverifier.go | 2 +- commands/uploader.go | 2 +- t/t-pre-push.sh | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commands/command_clean.go b/commands/command_clean.go index 4eb52941..9c84e24f 100644 --- a/commands/command_clean.go +++ b/commands/command_clean.go @@ -63,7 +63,7 @@ func clean(gf *lfs.GitFilter, to io.Writer, from io.Reader, fileName string, fil } if err != nil { - ExitWithError(errors.Wrap(err, tr.Tr.Get("Error cleaning LFS object"))) + ExitWithError(errors.Wrap(err, tr.Tr.Get("Error cleaning Git LFS object"))) } tmpfile := cleaned.Filename diff --git a/commands/lockverifier.go b/commands/lockverifier.go index 98ccbc4b..1c43114e 100644 --- a/commands/lockverifier.go +++ b/commands/lockverifier.go @@ -69,7 +69,7 @@ func (lv *lockVerifier) Verify(ref *git.Ref) { Exit(tr.Tr.Get("error: Authentication error: %s", err)) } } else { - Print(tr.Tr.Get("Remote %q does not support the LFS locking API. Consider disabling it with:", cfg.PushRemote())) + Print(tr.Tr.Get("Remote %q does not support the Git LFS locking API. Consider disabling it with:", cfg.PushRemote())) Print(" $ git config lfs.%s.locksverify false", lv.endpoint.Url) if lv.verifyState == verifyStateEnabled { ExitWithError(err) diff --git a/commands/uploader.go b/commands/uploader.go index 282107df..4d804d82 100644 --- a/commands/uploader.go +++ b/commands/uploader.go @@ -295,7 +295,7 @@ func (c *uploadContext) ReportErrors() { action = tr.Tr.Get("failed") } - Print(tr.Tr.Get("LFS upload %s:", action)) + Print(tr.Tr.Get("Git LFS upload %s:", action)) for name, oid := range c.missing { // TRANSLATORS: Leading spaces should be preserved. Print(tr.Tr.Get(" (missing) %s (%s)", name, oid)) diff --git a/t/t-pre-push.sh b/t/t-pre-push.sh index 41bb4883..b64773e7 100755 --- a/t/t-pre-push.sh +++ b/t/t-pre-push.sh @@ -834,7 +834,7 @@ begin_test "pre-push locks verify 5xx with verification enabled" git config "lfs.$endpoint.locksverify" true git push origin main 2>&1 | tee push.log - grep "\"origin\" does not support the LFS locking API" push.log + grep "\"origin\" does not support the Git LFS locking API" push.log grep "git config lfs.$endpoint.locksverify false" push.log refute_server_object "$reponame" "$contents_oid" @@ -861,7 +861,7 @@ begin_test "pre-push disable locks verify on exact url" git config "lfs.$endpoint.locksverify" false git push origin main 2>&1 | tee push.log - [ "0" -eq "$(grep -c "\"origin\" does not support the LFS locking API" push.log)" ] + [ "0" -eq "$(grep -c "\"origin\" does not support the Git LFS locking API" push.log)" ] assert_server_object "$reponame" "$contents_oid" ) @@ -887,7 +887,7 @@ begin_test "pre-push disable locks verify on partial url" git config "lfs.$endpoint.locksverify" false git push origin main 2>&1 | tee push.log - [ "0" -eq "$(grep -c "\"origin\" does not support the LFS locking API" push.log)" ] + [ "0" -eq "$(grep -c "\"origin\" does not support the Git LFS locking API" push.log)" ] assert_server_object "$reponame" "$contents_oid" ) @@ -1004,7 +1004,7 @@ begin_test "pre-push locks verify 5xx with verification unset" [ -z "$(git config "lfs.$endpoint.locksverify")" ] git push origin main 2>&1 | tee push.log - grep "\"origin\" does not support the LFS locking API" push.log + grep "\"origin\" does not support the Git LFS locking API" push.log assert_server_object "$reponame" "$contents_oid" )