Fix git amend to use configured upstream

fixes #222 commit-id:470862d8
ejoffe · Mar 30, 2022 · 749b443 · 749b443
1 parent 7e024f7
commit 749b443
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/cmd/amend/main.go b/cmd/amend/main.go
@@ -21,7 +21,8 @@ var (
 
 // command line opts
 type opts struct {
-	Version bool `short:"v" long:"version" description:"Show version info."`
+	Debug   bool `short:"d" long:"debug" description:"Show verbose debug info."`
+	Version bool `short:"v" long:"version" description:"Show version."`
 }
 
 func init() {
@@ -39,6 +40,10 @@ func main() {
 		os.Exit(0)
 	}
 
+	if opts.Debug {
+		zerolog.SetGlobalLevel(zerolog.DebugLevel)
+	}
+
 	gitcmd := realgit.NewGitCmd(config.DefaultConfig())
 	//  check that we are inside a git dir
 	var output string

diff --git a/git/mockgit/mockgit.go b/git/mockgit/mockgit.go
@@ -85,7 +85,7 @@ func (m *Mock) ExpectRemote(remote string) {
 
 func (m *Mock) ExpectFixup(commitHash string) {
 	m.expect("git commit --fixup " + commitHash)
-	m.expect("git rebase -i --autosquash --autostash")
+	m.expect("git rebase -i --autosquash --autostash origin/master")
 }
 
 func (m *Mock) expect(cmd string, args ...interface{}) *Mock {

diff --git a/spr/spr.go b/spr/spr.go
@@ -75,7 +75,10 @@ func (sd *stackediff) AmendCommit(ctx context.Context) {
 	commitIndex = commitIndex - 1
 	check(err)
 	sd.mustgit("commit --fixup "+localCommits[commitIndex].CommitHash, nil)
-	sd.mustgit("rebase -i --autosquash --autostash", nil)
+
+	rebaseCmd := fmt.Sprintf("rebase -i --autosquash --autostash %s/%s",
+		sd.config.Repo.GitHubRemote, sd.config.Repo.GitHubBranch)
+	sd.mustgit(rebaseCmd, nil)
 }
 
 func (sd *stackediff) addReviewers(ctx context.Context,