Fix #2 branches with same name in multiple remotes

[slackorama]

Use git config to get the correct upstream remote and branch when you
have branch with the same name in multiple remotes (e.g. "origin/master"
and "coworker/master"). Uses awk which may be a problem?

[michaeldfallen]

Thanks for this. Unsure about the ack usage, is it commonly installed? Can we use awk, grep or sed instead?

There were a few tests failing due to mistakes I had made that this highlights so I've fixed those and opened slackorama#1. Once those are in we can merge this.

[michaeldfallen]

Closing for now until slackorama#1 is merged. (Just so I remember which PRs I haven't addressed yet).

[slackorama]

Sorry I must be missing something. Where did I use ack?

[michaeldfallen]

sorry, I meant awk. Yeah I use ack and mistook the two.

Is awk commonly available on systems?

[slackorama]

I use ack all the time too so I thought I had put it in there. Whew.

awk is part of POSIX and Single Unix so it's on almost all *nix systems (aside from a few weirdos).

[slackorama]

This actually has a bug in it if the branch name has a slash in it (e.g. "feature/foobar").

I just pushed a new branch that has a fix for it and removes the awk calls to use sed instead.