[PATCH 0/2] nmbug: Bump to 0.3 and document in NEWS

[PATCH 0/2] nmbug: Bump to 0.3 and document in NEWS

[W. Trevor King]

As discussed previously in [1,2,3].  I've split this into two patches,
and only covered the changes since the last notmuch release.  There
have been additional changes since nmbug 0.2 (which went out with
notmuch 0.19), and I mention them in the commit message for patch 1/1,
but none of them seemed important enough to call out in NEWS.

I'm also fine leaving these changes out of NEWS and just bumping the
nmbug version (which is why I split this series into two patches).

Cheers,
Trevor

[1]: id:cover.1507675236.git.wking@tremily.us
     Subject: [PATCH 0/3] nmbug:
     Date: Tue, 10 Oct 2017 15:49:48 -0700
[2]: id: id:20171211174707.GX19165@valgrind.us
     Subject: Re: [PATCH 3/4] nmbug: Auto-checkout in clone if it
       wouldn't clobber
     Date: Mon, 11 Dec 2017 09:47:07 -0800
[3]: id:87a7ypdm3p.fsf@tesseract.cs.unb.ca
     Subject: Re: [PATCH 3/4] nmbug: Auto-checkout in clone if it
       wouldn't clobber
     Date: Mon, 11 Dec 2017 16:51:38 -0400

W. Trevor King (2):
  nmbug: Bump to version 0.3
  NEWS: Add nmbug 0.3 release notes to the notmuch 0.26 section

 NEWS              | 13 +++++++++++++
 devel/nmbug/nmbug |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

-- 
2.13.6

[PATCH 1/2] nmbug: Bump to version 0.3

[W. Trevor King]

Changes since 0.2:

* Accept failures to unset core.worktree in clone (0a155847,
  2017-10-10, unreleased).
* Use --no-renames in log (f9189a06, 2016-09-26, v0.24).
* Auto-checkout in clone if it wouldn't clobber (7ef3b653, 2017-10-10,
  unreleased).
* Add a 'help' command for folks who don't like --help
  (9d25c97d, 2014-10-03, v0.20).
* Setup a 'config' branch on clone to track origin/config (244f8739,
  2015-03-22, v0.20).  This branch may be consumed by
  notmuch-report(1).
* Only error for invalid diff lines in tags/ (57225988, 2017-10-16,
  unreleased).
* Ignore # comments in 'notmuch dump ...' output (9bbc54bd,
  2016-03-27, v0.22).
* Respect 'expect' in _spawn(..., wait=True) (e263c5b1, 2017-10-10,
  unreleased).
* Update URLs in documentation (554b90b5 and 6a833a6e8, 2016-06-02,
  v0.23).
---
 devel/nmbug/nmbug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug
index 8c7e925c..c35dd75d 100755
--- a/devel/nmbug/nmbug
+++ b/devel/nmbug/nmbug
@@ -51,7 +51,7 @@ except ImportError:  # Python 2
     from urllib import unquote as _unquote
 
 
-__version__ = '0.2'
+__version__ = '0.3'
 
 _LOG = _logging.getLogger('nmbug')
 _LOG.setLevel(_logging.WARNING)
-- 
2.13.6

[PATCH 2/2] NEWS: Add nmbug 0.3 release notes to the notmuch 0.26 section

[W. Trevor King]

---
 NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 6d2bf138..3b6404e7 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,19 @@ Indexing cleartext of encrypted e-mails
   that the notmuch index itself is adequately protected.  DO NOT USE
   this feature without considering the security of your index.
 
+nmbug
+-----
+
+nmbug's internal version increases to 0.3 in this notmuch release.
+User-facing changes with this notmuch release:
+
+* Accept failures to unset `core.worktree` in `clone`, which allows
+  nmbug to be used with Git 2.11.0 and later.
+* Auto-checkout in `clone` if it wouldn't clobber existing content,
+  which makes the initial clone more convenient.
+* Only error for invalid diff lines in `tags/`, which allows for
+  `README`s and similar in nmbug repositories.
+
 Notmuch 0.25.3 (2017-12-08)
 ===========================
 
-- 
2.13.6

Re: [PATCH 0/2] nmbug: Bump to 0.3 and document in NEWS

[Tomi Ollila]

On Thu, Dec 28 2017, W. Trevor King wrote:

> As discussed previously in [1,2,3].  I've split this into two patches,
> and only covered the changes since the last notmuch release.  There
> have been additional changes since nmbug 0.2 (which went out with
> notmuch 0.19), and I mention them in the commit message for patch 1/1,
> but none of them seemed important enough to call out in NEWS.
>
> I'm also fine leaving these changes out of NEWS and just bumping the
> nmbug version (which is why I split this series into two patches).

Series LGTM

Tomi

>
> Cheers,
> Trevor
>
> [1]: id:cover.1507675236.git.wking@tremily.us
>      Subject: [PATCH 0/3] nmbug:
>      Date: Tue, 10 Oct 2017 15:49:48 -0700
> [2]: id: id:20171211174707.GX19165@valgrind.us
>      Subject: Re: [PATCH 3/4] nmbug: Auto-checkout in clone if it
>        wouldn't clobber
>      Date: Mon, 11 Dec 2017 09:47:07 -0800
> [3]: id:87a7ypdm3p.fsf@tesseract.cs.unb.ca
>      Subject: Re: [PATCH 3/4] nmbug: Auto-checkout in clone if it
>        wouldn't clobber
>      Date: Mon, 11 Dec 2017 16:51:38 -0400
>
> W. Trevor King (2):
>   nmbug: Bump to version 0.3
>   NEWS: Add nmbug 0.3 release notes to the notmuch 0.26 section
>
>  NEWS              | 13 +++++++++++++
>  devel/nmbug/nmbug |  2 +-
>  2 files changed, 14 insertions(+), 1 deletion(-)
>
> -- 
> 2.13.6
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 0/2] nmbug: Bump to 0.3 and document in NEWS

[Daniel Kahn Gillmor]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

On Fri 2017-12-29 17:33:45 +0200, Tomi Ollila wrote:
> On Thu, Dec 28 2017, W. Trevor King wrote:
>
>> As discussed previously in [1,2,3].  I've split this into two patches,
>> and only covered the changes since the last notmuch release.  There
>> have been additional changes since nmbug 0.2 (which went out with
>> notmuch 0.19), and I mention them in the commit message for patch 1/1,
>> but none of them seemed important enough to call out in NEWS.
>>
>> I'm also fine leaving these changes out of NEWS and just bumping the
>> nmbug version (which is why I split this series into two patches).
>
> Series LGTM

also LGTM.  I've removed the notmuch::needs-review tags on this.

     --dkg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 1/2] nmbug: Bump to version 0.3

[David Bremner]

"W. Trevor King" <wking@tremily.us> writes:

> Changes since 0.2:

pushed both to release

d