Add pushing support with push.go

No tests for this, though it might be very easy to test.

push.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"github.com/ztrue/tracerr"
+)
+
+func push(repoPath string) error {
+	bi, err := fetchBranchInfo(repoPath)
+	if err != nil {
+		return tracerr.Wrap(err)
+	}
+
+	if bi.UpstreamBranch == "" || bi.UpstreamRemote == "" {
+		return nil
+	}
+
+	err, _ = GitCommand(repoPath, []string{"push", bi.UpstreamRemote + "/" + bi.UpstreamBranch})
+	if err != nil {
+		return tracerr.Wrap(err)
+	}
+
+	return nil
+}

rebase.go

@@ -13,32 +13,12 @@ import (
 )
 
 func rebase(repoPath string) error {
-	repo, err := git.PlainOpen(repoPath)
-	if err != nil {
-		return tracerr.Wrap(err)
-	}
-
-	config, err := repo.Config()
-	if err != nil {
-		return tracerr.Wrap(err)
-	}
-
-	ref, err := repo.Reference(plumbing.HEAD, false)
+	bi, err := fetchBranchInfo(repoPath)
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
 
-	currentBranchName := ref.Target().Short()
-	branchConfig := config.Branches[currentBranchName]
-	if branchConfig == nil {
-		// No tracking branch, nothing to do
-		return nil
-	}
-
-	remoteName := branchConfig.Remote
-	remoteBranchName := branchConfig.Merge.Short()
-
-	rebaseErr, _ := GitCommand(repoPath, []string{"rebase", remoteName + "/" + remoteBranchName})
+	rebaseErr, _ := GitCommand(repoPath, []string{"rebase", bi.UpstreamRemote + "/" + bi.UpstreamBranch})
 	if rebaseErr != nil {
 		ra, err := exists(path.Join(repoPath, ".git", "rebase-apply"))
 		if err != nil {
@@ -82,3 +62,39 @@ func exists(name string) (bool, error) {
 	}
 	return false, err
 }
+
+type branchInfo struct {
+	CurrentBranch  string
+	UpstreamRemote string
+	UpstreamBranch string
+}
+
+func fetchBranchInfo(repoPath string) (branchInfo, error) {
+	repo, err := git.PlainOpen(repoPath)
+	if err != nil {
+		return branchInfo{}, tracerr.Wrap(err)
+	}
+
+	config, err := repo.Config()
+	if err != nil {
+		return branchInfo{}, tracerr.Wrap(err)
+	}
+
+	ref, err := repo.Reference(plumbing.HEAD, false)
+	if err != nil {
+		return branchInfo{}, tracerr.Wrap(err)
+	}
+
+	currentBranchName := ref.Target().Short()
+	branchConfig := config.Branches[currentBranchName]
+	if branchConfig == nil {
+		// No tracking branch, nothing to do
+		return branchInfo{CurrentBranch: currentBranchName}, nil
+	}
+
+	return branchInfo{
+		CurrentBranch:  currentBranchName,
+		UpstreamRemote: branchConfig.Remote,
+		UpstreamBranch: branchConfig.Merge.Short(),
+	}, nil
+}