diff --git a/mob.go b/mob.go index 267c9ef..831a68c 100644 --- a/mob.go +++ b/mob.go @@ -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) { @@ -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 { @@ -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 {