From: W. Trevor King <wking@tremily.us>
Date: Sun, 6 Jul 2014 20:40:20 +0000 (-0700)
Subject: nmbug: Handle missing @upstream in is_unmerged
X-Git-Tag: 0.19_rc1~125
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=567aab405b05d9ef79ddf1b62302806b9ddbeaad;hp=567aab405b05d9ef79ddf1b62302806b9ddbeaad;p=notmuch

nmbug: Handle missing @upstream in is_unmerged

If we don't have an upstream, there is nothing to merge, so nothing is
unmerged.  This avoids errors like:

  $ nmbug status
  error: No upstream configured for branch 'master'
  error: No upstream configured for branch 'master'
  fatal: ambiguous argument '@{upstream}': unknown revision or path not in the working tree.
  Use '--' to separate paths from revisions, like this:
  'git <command> [<revision>...] -- [<file>...]'
  'git rev-parse @{upstream}' exited with nonzero value

You might not have an upstream if you're only using nmbug locally to
version-control your tags.
---