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

remove isClean 

Fixes #1

Signed-off-by: jolheiser <john.olheiser@gmail.com>
main
jolheiser 2022-10-04 09:00:02 -05:00
parent 1622f99d5d
commit 9a09094080
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/backport.go
View File

@ -11,7 +11,6 @@ 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"
)
@ -47,10 +46,6 @@ func (h *Handler) Backport() *ffcli.Command {
h.fetch(ctx)
if isClean() {
log.Fatal().Msg("working tree is dirty")
}
from := *fromFlag
if from == "" {
from = "main"

2
cmd/branch.go
View File

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

5
cmd/frontport.go
View File

@ -11,7 +11,6 @@ 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 {
@ -40,10 +39,6 @@ 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),
})