Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Jan 6, 2013
Merged

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

merged 2 commits into from Jan 6, 2013

Conversation

tarsius
Copy link
Member

@tarsius tarsius commented Nov 21, 2012

No description provided.

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.
Otherwise return nil.  Previously this attempted to propertize nil.
@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
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants