From 190ea6c7f39357634303cdc214bf6808bb0d4f71 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 10 Jan 2023 21:57:47 -0600 Subject: [PATCH] fix: add index to back/frontport Signed-off-by: jolheiser --- cmd/backport.go | 2 +- cmd/frontport.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/backport.go b/cmd/backport.go index 5e843c4..cc462f3 100644 --- a/cmd/backport.go +++ b/cmd/backport.go @@ -85,7 +85,7 @@ func (h *Handler) Backport() *ffcli.Command { index = m[1] } - branch := fmt.Sprintf("backport-%s", index) + branch := fmt.Sprintf("backport-%s-%s", to, index) base := fmt.Sprintf("upstream/release/v1.%s", to) if err := h.Branch().ParseAndRun(ctx, []string{"--base", base, branch}); err != nil { return err diff --git a/cmd/frontport.go b/cmd/frontport.go index c096fd8..8a8554a 100644 --- a/cmd/frontport.go +++ b/cmd/frontport.go @@ -70,7 +70,7 @@ func (h *Handler) Frontport() *ffcli.Command { index = m[1] } - branch := fmt.Sprintf("frontport-%s", index) + branch := fmt.Sprintf("frontport-%s-%s", from, index) base := *toFlag if base == "" {