.goreleaser.yaml

@@ -6,7 +6,7 @@ builds:
       - windows
       - darwin
     ldflags:
-      - "-s -w -X go.jolheiser.com/git-ea/cmd.Version={{.Version}}"
+      - "-s -w -X main.Version={{.Version}}"
 archives:
   - replacements:
       386: i386

cmd/backport.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/peterbourgon/ff/v3/ffcli"
+	"github.com/rs/zerolog/log"
 	"github.com/skratchdot/open-golang/open"
 )
 
@@ -46,6 +47,10 @@ func (h *Handler) Backport() *ffcli.Command {
 
 			h.fetch(ctx)
 
+			if isClean() {
+				log.Fatal().Msg("working tree is dirty")
+			}
+
 			from := *fromFlag
 			if from == "" {
 				from = "main"

cmd/branch.go

@@ -57,7 +57,7 @@ func (h *Handler) Branch() *ffcli.Command {
 			case strings.HasPrefix(base, "u/"):
 				base = "upstream/" + strings.TrimPrefix(base, "u/")
 			}
-			if !strings.HasPrefix(base, "upstream") && !strings.HasPrefix(base, "origin") && !strings.HasPrefix(base, "pr-") {
+			if (!strings.HasPrefix(base, "upstream") || !strings.HasPrefix(base, "origin")) && !strings.HasPrefix(base, "pr-") {
 				base = fmt.Sprintf("upstream/%s", base)
 			}
 

cmd/frontport.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/peterbourgon/ff/v3/ffcli"
+	"github.com/rs/zerolog/log"
 )
 
 func (h *Handler) Frontport() *ffcli.Command {
@@ -39,6 +40,10 @@ func (h *Handler) Frontport() *ffcli.Command {
 
 			h.fetch(ctx)
 
+			if !isClean() {
+				log.Fatal().Msg("working tree is dirty")
+			}
+
 			commits, err := h.repo().Log(&git.LogOptions{
 				From: h.head(from),
 			})