nmbug: Handle missing @upstream in is_unmerged

[notmuch] / devel / nmbug / nmbug

diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index 4a79722613c85fd869244a7bccf7f04604806b8f..998ee6b4b0d083467617dff92c1eab78132ce2d3 100755 (executable)
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -430,7 +430,10 @@ sub do_status {
 sub is_unmerged {
   my $commit = shift || '@{upstream}';
 
-  my $fetch_head = git ('rev-parse', $commit);
+  my ($fetch_head, $status) = git_with_status ('rev-parse', $commit);
+  if ($status) {
+    return 0;
+  }
   my $base = git ( 'merge-base', 'HEAD', $commit);
 
   return ($base ne $fetch_head);