lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands,t: use Git LFS project name in messages

Browse Source 
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.
This commit is contained in:
Chris Darroch 2022-01-27 09:31:41 -08:00
parent ab10f81331
commit ec219b27d4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/command_clean.go
View File

@ -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

2
commands/lockverifier.go
View File

@ -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)

2
commands/uploader.go
View File

@ -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))

8
t/t-pre-push.sh
View File

@ -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"
)