git config branch.autosetupmerge: always is not optimal

[shauntarves]

Hi there,

https://github.com/strapsh/strap/blob/master/cmd/run#L193 has [may be] unintended consequences. In simple workflows that use a local branch with a remote branch of the same name, having autosetupmerge requires that the branch be created on the remote first (or always use --no-track with a git branch command).

I'm curious about the motivation for having this set and whether you would be willing to remove this setting if I created a PR for it.

[lhazlewood]

Hi Shaun!

It was mostly due to convenience since most people have repositories on the origin before using strap.

What would be the repercussions of removing the line?

[shauntarves]

The repercussion would be that the user would have to use set-upstream on their git push if they HADN'T already checked out from remote. If your workflow already involves having a branch on the origin and you check that out, then nothing extra is needed.

The way I look at it, if you don't have a remote branch already, autosetupmerge kind of screws up your local branch, but if you're used to creating and pulling remote branches before you work, removing autosetupmerge has no effect.