X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug;h=998ee6b4b0d083467617dff92c1eab78132ce2d3;hb=567aab405b05d9ef79ddf1b62302806b9ddbeaad;hp=4a79722613c85fd869244a7bccf7f04604806b8f;hpb=c2bbe9eb6c46b2f1723ce6c5e26816dd82e42c6f;p=notmuch diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug index 4a797226..998ee6b4 100755 --- 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);