Allow user input for git fetch in repo sync

samcoe · samcoe · commit a8492bb0eab7 · 2021-09-13T10:14:20.000-07:00
diff --git a/pkg/cmd/repo/sync/git.go b/pkg/cmd/repo/sync/git.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/cli/cli/v2/git"
+	"github.com/cli/cli/v2/pkg/iostreams"
 )
 
 type gitClient interface {
@@ -20,7 +21,9 @@ type gitClient interface {
 	ResetHard(string) error
 }
 
-type gitExecuter struct{}
+type gitExecuter struct {
+	io *iostreams.IOStreams
+}
 
 func (g *gitExecuter) BranchRemote(branch string) (string, error) {
 	args := []string{"rev-parse", "--symbolic-full-name", "--abbrev-ref", fmt.Sprintf("%s@{u}", branch)}
@@ -64,11 +67,14 @@ func (g *gitExecuter) CurrentBranch() (string, error) {
 }
 
 func (g *gitExecuter) Fetch(remote, ref string) error {
-	args := []string{"fetch", remote, ref}
+	args := []string{"fetch", "-q", remote, ref}
 	cmd, err := git.GitCommand(args...)
 	if err != nil {
 		return err
 	}
+	cmd.Stdin = g.io.In
+	cmd.Stdout = g.io.Out
+	cmd.Stderr = g.io.ErrOut
 	return cmd.Run()
 }
 
diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go
@@ -34,7 +34,7 @@ func NewCmdSync(f *cmdutil.Factory, runF func(*SyncOptions) error) *cobra.Comman
 		IO:         f.IOStreams,
 		BaseRepo:   f.BaseRepo,
 		Remotes:    f.Remotes,
-		Git:        &gitExecuter{},
+		Git:        &gitExecuter{io: f.IOStreams},
 	}
 
 	cmd := &cobra.Command{
@@ -134,6 +134,11 @@ func syncLocalRepo(opts *SyncOptions) error {
 		}
 	}
 
+	// Git fetch might require input from user, so do it before starting progess indicator.
+	if err := opts.Git.Fetch(remote, fmt.Sprintf("refs/heads/%s", opts.Branch)); err != nil {
+		return err
+	}
+
 	opts.IO.StartProgressIndicator()
 	err = executeLocalRepoSync(srcRepo, remote, opts)
 	opts.IO.StopProgressIndicator()
@@ -232,10 +237,6 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt
 	branch := opts.Branch
 	useForce := opts.Force
 
-	if err := git.Fetch(remote, fmt.Sprintf("refs/heads/%s", branch)); err != nil {
-		return err
-	}
-
 	hasLocalBranch := git.HasLocalBranch(branch)
 	if hasLocalBranch {
 		branchRemote, err := git.BranchRemote(branch)

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`
`7`	`7`	`"github.com/cli/cli/v2/git"`
	`8`	`+ "github.com/cli/cli/v2/pkg/iostreams"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`type gitClient interface {`
`@@ -20,7 +21,9 @@ type gitClient interface {`
`20`	`21`	`ResetHard(string) error`
`21`	`22`	`}`
`22`	`23`
`23`		`-type gitExecuter struct{}`
	`24`	`+type gitExecuter struct {`
	`25`	`+ io *iostreams.IOStreams`
	`26`	`+}`
`24`	`27`
`25`	`28`	`func (g *gitExecuter) BranchRemote(branch string) (string, error) {`
`26`	`29`	`args := []string{"rev-parse", "--symbolic-full-name", "--abbrev-ref", fmt.Sprintf("%s@{u}", branch)}`
`@@ -64,11 +67,14 @@ func (g *gitExecuter) CurrentBranch() (string, error) {`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`func (g *gitExecuter) Fetch(remote, ref string) error {`
`67`		`- args := []string{"fetch", remote, ref}`
	`70`	`+ args := []string{"fetch", "-q", remote, ref}`
`68`	`71`	`cmd, err := git.GitCommand(args...)`
`69`	`72`	`if err != nil {`
`70`	`73`	`return err`
`71`	`74`	`}`
	`75`	`+ cmd.Stdin = g.io.In`
	`76`	`+ cmd.Stdout = g.io.Out`
	`77`	`+ cmd.Stderr = g.io.ErrOut`
`72`	`78`	`return cmd.Run()`
`73`	`79`	`}`
`74`	`80`