зеркало из https://github.com/mislav/hub.git
Clean up errors.New
This commit is contained in:
Родитель
9a6a156a79
Коммит
309b5bb1de
17
git/git.go
17
git/git.go
|
@ -1,7 +1,6 @@
|
|||
package git
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/jingweno/gh/cmd"
|
||||
"path/filepath"
|
||||
|
@ -11,7 +10,7 @@ import (
|
|||
func Version() (string, error) {
|
||||
output, err := execGitCmd("version")
|
||||
if err != nil {
|
||||
return "", errors.New("Can't load git version")
|
||||
return "", fmt.Errorf("Can't load git version")
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -20,7 +19,7 @@ func Version() (string, error) {
|
|||
func Dir() (string, error) {
|
||||
output, err := execGitCmd("rev-parse", "-q", "--git-dir")
|
||||
if err != nil {
|
||||
return "", errors.New("Not a git repository (or any of the parent directories): .git")
|
||||
return "", fmt.Errorf("Not a git repository (or any of the parent directories): .git")
|
||||
}
|
||||
|
||||
gitDir := output[0]
|
||||
|
@ -44,7 +43,7 @@ func PullReqMsgFile() (string, error) {
|
|||
func Editor() (string, error) {
|
||||
output, err := execGitCmd("var", "GIT_EDITOR")
|
||||
if err != nil {
|
||||
return "", errors.New("Can't load git var: GIT_EDITOR")
|
||||
return "", fmt.Errorf("Can't load git var: GIT_EDITOR")
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -53,7 +52,7 @@ func Editor() (string, error) {
|
|||
func Head() (string, error) {
|
||||
output, err := execGitCmd("symbolic-ref", "-q", "HEAD")
|
||||
if err != nil {
|
||||
return "", errors.New("Can't load git HEAD")
|
||||
return "", fmt.Errorf("Can't load git HEAD")
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -62,7 +61,7 @@ func Head() (string, error) {
|
|||
func SymbolicFullName(name string) (string, error) {
|
||||
output, err := execGitCmd("rev-parse", "--symbolic-full-name", name)
|
||||
if err != nil {
|
||||
return "", errors.New("Unknown revision or path not in the working tree: " + name)
|
||||
return "", fmt.Errorf("Unknown revision or path not in the working tree: %s", name)
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -71,7 +70,7 @@ func SymbolicFullName(name string) (string, error) {
|
|||
func Ref(ref string) (string, error) {
|
||||
output, err := execGitCmd("rev-parse", "-q", ref)
|
||||
if err != nil {
|
||||
return "", errors.New("Unknown revision or path not in the working tree: " + ref)
|
||||
return "", fmt.Errorf("Unknown revision or path not in the working tree: %s", ref)
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -90,7 +89,7 @@ func RefList(a, b string) ([]string, error) {
|
|||
func Show(sha string) (string, error) {
|
||||
output, err := execGitCmd("show", "-s", "--format=%w(78,0,0)%s%+b", sha)
|
||||
if err != nil {
|
||||
return "", errors.New("Can't show commit for %s" + sha)
|
||||
return "", fmt.Errorf("Can't show commit for %s", sha)
|
||||
}
|
||||
|
||||
return output[0], nil
|
||||
|
@ -106,7 +105,7 @@ func Log(sha1, sha2 string) (string, error) {
|
|||
|
||||
outputs, err := execCmd.ExecOutput()
|
||||
if err != nil {
|
||||
return "", errors.New("Can't load git log " + sha1 + ".." + sha2)
|
||||
return "", fmt.Errorf("Can't load git log %s..%s", sha1, sha2)
|
||||
}
|
||||
|
||||
return outputs, nil
|
||||
|
|
Загрузка…
Ссылка в новой задаче