Merge pull request #4943 from chrisd8088/minor-text-fixups

Update and correct several error message strings
This commit is contained in:
Chris Darroch 2022-04-14 10:14:29 -07:00 committed by GitHub
commit 2fee8da0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

@ -178,7 +178,7 @@ func installHooks(force bool) error {
// uninstallHooks removes all hooks in range of the `hooks` var.
func uninstallHooks() error {
if !cfg.InRepo() {
return errors.New(tr.Tr.Get("Not in a git repository"))
return errors.New(tr.Tr.Get("Not in a Git repository"))
}
hookDir, err := cfg.HookDir()

@ -1324,17 +1324,17 @@ func GetFilesChanged(from, to string) ([]string, error) {
cmd := gitNoLFS(args...)
outp, err := cmd.StdoutPipe()
if err != nil {
return nil, errors.New(tr.Tr.Get("failed to call `git diff`: %v", err))
return nil, errors.New(tr.Tr.Get("failed to call `git diff-tree`: %v", err))
}
if err := cmd.Start(); err != nil {
return nil, errors.New(tr.Tr.Get("failed to start `git diff`: %v", err))
return nil, errors.New(tr.Tr.Get("failed to start `git diff-tree`: %v", err))
}
scanner := bufio.NewScanner(outp)
for scanner.Scan() {
files = append(files, strings.TrimSpace(scanner.Text()))
}
if err := cmd.Wait(); err != nil {
return nil, errors.New(tr.Tr.Get("`git diff` failed: %v", err))
return nil, errors.New(tr.Tr.Get("`git diff-tree` failed: %v", err))
}
return files, err