fix(cmd/new): print exception to console (#1227)

* fix(cmd/new): print exception to console

* using git command to replace judgment text
pull/1229/head
包子 3 years ago committed by GitHub
parent 0e70bddaa9
commit 1a0a1b8a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      cmd/kratos/internal/base/repo.go

@ -1,7 +1,6 @@
package base package base
import ( import (
"bytes"
"context" "context"
"os" "os"
"os/exec" "os/exec"
@ -51,15 +50,17 @@ func (r *Repo) Path() string {
// Pull fetch the repository from remote url. // Pull fetch the repository from remote url.
func (r *Repo) Pull(ctx context.Context) error { func (r *Repo) Pull(ctx context.Context) error {
cmd := exec.Command("git", "pull") cmd := exec.Command("git", "symbolic-ref", "HEAD")
cmd.Dir = r.Path() cmd.Dir = r.Path()
var out bytes.Buffer
cmd.Stderr = &out
cmd.Stdout = os.Stdout
err := cmd.Run() err := cmd.Run()
if strings.Contains(out.String(), "You are not currently on a branch.") { if err != nil {
return nil return nil
} }
cmd = exec.Command("git", "pull")
cmd.Dir = r.Path()
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
err = cmd.Run()
return err return err
} }

Loading…
Cancel
Save