Pass valid config to git amend

fixes: #101 commit-id:e0317625
ejoffe · Oct 1, 2021 · 74df668 · 74df668
1 parent ac0b650
commit 74df668
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.spr.yml b/.spr.yml
@@ -2,3 +2,5 @@ githubRepoOwner: ejoffe
 githubRepoName: spr
 requireChecks: true
 requireApproval: false
+githubRemote: origin
+githubBranch: master
diff --git a/cmd/amend/main.go b/cmd/amend/main.go
@@ -39,8 +39,7 @@ func main() {
 		os.Exit(0)
 	}
 
-	gitcmd := realgit.NewGitCmd(config.EmptyConfig())
-
+	gitcmd := realgit.NewGitCmd(config.DefaultConfig())
 	//  check that we are inside a git dir
 	var output string
 	err = gitcmd.Git("status --porcelain", &output)
@@ -50,8 +49,11 @@ func main() {
 		os.Exit(2)
 	}
 
+	cfg := config.ParseConfig(gitcmd)
+	gitcmd = realgit.NewGitCmd(cfg)
 	ctx := context.Background()
-	sd := spr.NewStackedPR(nil, nil, gitcmd, os.Stdout)
+
+	sd := spr.NewStackedPR(cfg, nil, gitcmd, os.Stdout)
 	sd.AmendCommit(ctx)
 }