default to upstream branch

[lovef]

Hello again

I always name my remote branches with a prefix. For instance I push upstream-branch to remote branch lovef.code/upstream-branch. Therefore I like git open to default open the upstream branch. Currently I would instead get a 404

[derimagia]

https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtmerge It looks like this could have multiple values but git config will just get the first value so it should be fine.

I think we can convert a lot of these lines to git for-each-ref.

git for-each-ref --format='%(upstream:short)' "$(git symbolic-ref -q HEAD)". will return origin/upstream-branch for example and then it can be split like the urlpath is below. I feel like we may be able to simplify some of the existing code here

[derimagia]

I'm fine with pushing this off, it's not a big deal. I would like to not use sed though, for now something like this would work:

branch_ref="$(git symbolic-ref -q HEAD)"
tracked_remote="$(git for-each-ref --format='%(upstream:remotename)' "$branch_ref")"
upstream_branch="$(git for-each-ref --format='%(upstream:lstrip=-1)' "$branch_ref")"

[lovef]

Travis tests fails for remotename, is it new? fatal: unrecognized %(upstream:remotename) argument: remotename

Other than that I wouldn't mind for-each-ref, though it would need some more tweaking to handle user input.

Also lstrip=-1 wouldn't work for me since I have a / in my remote branch name, though lstrip=3 seems to to do the trick

[lovef]

Did another attempt without sed using parameter-substitution

upstream_branch_full_name=$(git config "branch.$branch.merge")
upstream_branch=${upstream_branch_full_name#"refs/heads/"}

[derimagia]

Good call looks semi-new (from 2017): git/git@cc72385.

[derimagia]

Sorry for taking so long to get to this, looks good 👍