deal with only one of branch.b.remote or branch.b.merge being defined #509

Merged
merged 2 commits into from Jan 6, 2013

Conversation

Projects
None yet
2 participants
Owner

tarsius commented Nov 21, 2012

No description provided.

tarsius added some commits Nov 21, 2012

@tarsius tarsius magit-remote-branch-for: deal with branch.b.remote being undefined
If branch.b.remote is undefined return nil just as we already do if
branch.b.merge is undefined.  We could instead default to the local
repository (".") but git itself also does not do that.
0d637c8
@tarsius tarsius magit-remote-string: check whether remote-branch is non-nil
Otherwise return nil.  Previously this attempted to propertize nil.
9c6f2d5

@sigma sigma merged commit 9c6f2d5 into magit:master Jan 6, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment