[PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-19 Thread David Bremner
"W. Trevor King" writes: > On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: >> W. Trevor King writes: >> > If we don't have an upstream, there is nothing to merge, so >> > nothing is unmerged. This avoids errors like: >> >> pushed this one patch. > > Without the stderr-catching

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-19 Thread David Bremner
W. Trevor King wk...@tremily.us writes: On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: W. Trevor King writes: If we don't have an upstream, there is nothing to merge, so nothing is unmerged. This avoids errors like: pushed this one patch. Without the stderr-catching of

[PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-17 Thread David Bremner
"W. Trevor King" writes: > On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: >> W. Trevor King writes: >> > If we don't have an upstream, there is nothing to merge, so >> > nothing is unmerged. This avoids errors like: >> >> pushed this one patch. > > Without the stderr-catching

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-17 Thread David Bremner
W. Trevor King wk...@tremily.us writes: On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: W. Trevor King writes: If we don't have an upstream, there is nothing to merge, so nothing is unmerged. This avoids errors like: pushed this one patch. Without the stderr-catching of

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-17 Thread W. Trevor King
On Thu, Jul 17, 2014 at 06:28:55AM -0300, David Bremner wrote: W. Trevor King writes: On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: W. Trevor King writes: If we don't have an upstream, there is nothing to merge, so nothing is unmerged. This avoids errors like:

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-16 Thread David Bremner
W. Trevor King wk...@tremily.us writes: If we don't have an upstream, there is nothing to merge, so nothing is unmerged. This avoids errors like: pushed this one patch. d ___ notmuch mailing list notmuch@notmuchmail.org

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-16 Thread W. Trevor King
On Wed, Jul 16, 2014 at 07:36:10PM -0300, David Bremner wrote: W. Trevor King writes: If we don't have an upstream, there is nothing to merge, so nothing is unmerged. This avoids errors like: pushed this one patch. Without the stderr-catching of something like patch 3, this means folks

[PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-15 Thread David Bremner
"W. Trevor King" writes: > - my $fetch_head = git ('rev-parse', $commit); > + my ($fetch_head, $status) = git_with_status ('rev-parse', $commit); > + if ($status) { > +return 0; > + } Could there be other errors here, other than @{upstream} not existing? At first glance it seems like

[PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-15 Thread W. Trevor King
On Tue, Jul 15, 2014 at 08:44:53PM -0300, David Bremner wrote: > W. Trevor King writes: > > - my $fetch_head = git ('rev-parse', $commit); > > + my ($fetch_head, $status) = git_with_status ('rev-parse', $commit); > > + if ($status) { > > +return 0; > > + } > > Could there be other errors

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-15 Thread David Bremner
W. Trevor King wk...@tremily.us writes: - my $fetch_head = git ('rev-parse', $commit); + my ($fetch_head, $status) = git_with_status ('rev-parse', $commit); + if ($status) { +return 0; + } Could there be other errors here, other than @{upstream} not existing? At first glance it

Re: [PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-15 Thread W. Trevor King
On Tue, Jul 15, 2014 at 08:44:53PM -0300, David Bremner wrote: W. Trevor King writes: - my $fetch_head = git ('rev-parse', $commit); + my ($fetch_head, $status) = git_with_status ('rev-parse', $commit); + if ($status) { +return 0; + } Could there be other errors here, other

[PATCH 2/4] nmbug: Handle missing @upstream in is_unmerged

2014-07-06 Thread W. Trevor King
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