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

commands: separate migrate prefix from messages

Browse Source 
We separate the command-specific prefix output by the
"git lfs migrate" command from language-specific text strings
in several messages.

This is in keeping with the formatting used for all other
instances of this message prefix.
This commit is contained in:
Chris Darroch 2022-01-25 16:34:01 -08:00
parent 02448f5fde
commit 2eb80e53c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/command_migrate.go
View File

@ -361,9 +361,9 @@ func ensureWorkingCopyClean(in io.Reader, out io.Writer) {
}
if proceed {
fmt.Fprintf(out, "migrate: %s", tr.Tr.Get("changes in your working copy will be overridden ...\n"))
fmt.Fprintf(out, "migrate: %s\n", tr.Tr.Get("changes in your working copy will be overridden ..."))
} else {
Exit(tr.Tr.Get("migrate: working copy must not be dirty"))
Exit("migrate: %s", tr.Tr.Get("working copy must not be dirty"))
}
}

2
commands/command_migrate_import.go
View File

@ -435,7 +435,7 @@ func rewriteTree(gf *lfs.GitFilter, db *gitobj.ObjectDatabase, root []byte, path
subtreeEntry := tree.Entries[index]
if subtreeEntry.Type() != gitobj.TreeObjectType {
return nil, errors.Errorf(tr.Tr.Get("migrate: expected %s to be a tree, got %s", head, subtreeEntry.Type()))
return nil, errors.Errorf("migrate: %s", tr.Tr.Get("expected %s to be a tree, got %s", head, subtreeEntry.Type()))
}
rewrittenSubtree, err := rewriteTree(gf, db, subtreeEntry.Oid, tail)