Skip to content

sync: use push --force-with-lease when rebasing with push enabled (#20) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
craftamap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sync: use push --force-with-lease when rebasing with push enabled (#20) #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmd/commands/pr/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,14 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
cmdQueue = append(cmdQueue, []string{"git", "fetch", remoteName, pr.Destination.Branch.Name})
if Method == MethodOptionRebase {
cmdQueue = append(cmdQueue, []string{"git", "rebase", remoteDestinationBranch})
if Push {
cmdQueue = append(cmdQueue, []string{"git", "push", "--force-with-lease"})
}
} else {
cmdQueue = append(cmdQueue, []string{"git", "merge", "--commit", remoteDestinationBranch})
if Push {
cmdQueue = append(cmdQueue, []string{"git", "push"})
}
}

var builder strings.Builder
Expand All @@ -124,18 +130,11 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) {
return
}

if Push {
cmdQueue = [][]string{{"git", "push"}}
err = processCmdQueue(cmdQueue)
if err != nil {
logging.Error(err)
}
}
},
}

syncCmd.Flags().StringVar(&Method, "method", "merge", "sync using merge or rebase (merge/rebase)")
syncCmd.Flags().BoolVar(&Push, "push", true, "push after merge/rebase")
syncCmd.Flags().BoolVar(&Push, "push", true, "push after merge/push --force-with-lease after rebase")

prCmd.AddCommand(syncCmd)
}
Expand All @@ -147,6 +146,7 @@ func processCmdQueue(cmdQueue [][]string) error {
if err != nil {
return err
}
logging.Note(strings.Join(args, " "))
cmd := exec.Command(exe, args[1:]...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand Down