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

Merged
merged 2 commits into from Jan 6, 2013
Commits on Nov 21, 2012
  1. @tarsius

    magit-remote-branch-for: deal with branch.b.remote being undefined

    tarsius committed Nov 21, 2012
    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.
  2. @tarsius

    magit-remote-string: check whether remote-branch is non-nil

    tarsius committed Nov 21, 2012
    Otherwise return nil.  Previously this attempted to propertize nil.