Skip to content
Open
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions mob.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,9 @@ func helpRequested(parameter []string) bool {
}

func clean(configuration config.Configuration) {
git("fetch", configuration.RemoteName, "--prune")

currentBranch := gitCurrentBranch()
git("fetch", configuration.RemoteName, currentBranch.Name)

localBranches := gitBranches()

if currentBranch.isOrphanWipBranch(configuration) {
Expand Down Expand Up @@ -549,8 +549,10 @@ func start(configuration config.Configuration) error {
return errors.New("cannot start; clean working tree required")
}

git("fetch", configuration.RemoteName, "--prune")
currentBranch := gitCurrentBranch()
if !configuration.StartCreate {
git("fetch", configuration.RemoteName, currentBranch.Name)
}
currentBaseBranch, currentWipBranch := determineBranches(currentBranch, gitBranches(), configuration)

if !currentWipBranch.hasRemoteBranch(configuration) && configuration.StartJoin {
Expand Down Expand Up @@ -942,9 +944,11 @@ func done(configuration config.Configuration) {
return
}

git("fetch", configuration.RemoteName, "--prune")
currentBranch := gitCurrentBranch()

git("fetch", configuration.RemoteName, currentBranch.Name)

baseBranch, wipBranch := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
baseBranch, wipBranch := determineBranches(currentBranch, gitBranches(), configuration)

if wipBranch.hasRemoteBranch(configuration) {
if configuration.DoneSquash == config.SquashWip {
Expand Down
Loading