jolheiser
/
git-ea
1
0
Fork 0
Code Issues 1 Pull Requests Releases 9 Activity

fix: add index to back/frontport
ci/woodpecker/push/goreleaser Pipeline was successful Details
ci/woodpecker/tag/goreleaser Pipeline was successful Details 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
main v0.0.7
jolheiser 2023-01-10 21:57:47 -06:00
parent fe0e2e5707
commit 190ea6c7f3
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/backport.go
View File

@ -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

2
cmd/frontport.go
View File

@ -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 == "" {