Re: nmbug backtrace due to .mailmap

[Jani Nikula]

On Mon, 16 Oct 2017, "W. Trevor King"  wrote:
> b. Comment out the ‘_insist_committed()’ line in nmbug's ‘pull’
>definition and try again.  Make sure you restore the check after
>the successful pull.

FWIW this fixed it for me, thanks.

BR,
Jani.
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: nmbug backtrace due to .mailmap

[W. Trevor King]

On Mon, Oct 16, 2017 at 02:08:17PM -0700, W. Trevor King wrote:
> So I've pushed bce5a55c removing .mailmap, and folks without [1]
> should be back in business.
> …
> [1]: 
> id:4487e001b350aa8e343a1201d869cceca2a03ab6.1508176853.git.wk...@tremily.us

But Jani reports still being stuck.  It turns out that anyone who
pulled after 5ea99ebc but before bce5a55c will have problems with a
failing pull's early _insist_committed check, which depends on
get_status.  Anyone who cannot 'nmbug pull' due to the .mailmap should
either:

a. Apply the patch and try again.

b. Comment out the ‘_insist_committed()’ line in nmbug's ‘pull’
   definition and try again.  Make sure you restore the check after
   the successful pull.

c. Bypass nmbug and update their Git repository directly, using
   something like:

 $ GIT_DIR="${NMBGIT:=${HOME}/.nmbug}"
 $ GIT_WORK_TREE=$(mktemp -d)
 $ export GIT_DIR GIT_WORK_TREE
 $ git reset --hard HEAD
 $ git pull
 $ rm -rf "${GIT_WORK_TREE}"

   which is basically what ‘nmbug pull’ does, but translated from
   Python into shell.

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: nmbug backtrace due to .mailmap

[W. Trevor King]

On Mon, Oct 16, 2017 at 05:37:32PM -0300, David Bremner wrote:
> W. Trevor King writes:
> > On Mon, Oct 16, 2017 at 10:14:40PM +0300, Jani Nikula wrote:
> >> I also didn't see any discussion about adding a .mailmap prior to it
> >> being pushed.
> >
> > Sorry :/.  I didn't realize it would be an issue until I pushed it.  I
> > can't roll it back because the central repo only allows fast-forward
> > pushes, but maybe David can revert master to 4148cb4 (dropping
> > 5ea99eb)?  Until then, you can work around the current master by
> > applying this patch locally.
> 
> Reverts are fast-forward?

Ah, I'd been thinking of rewinding master, but yeah, pushing an
explicit revert commit should work too.  There may be cases where a
client that does not include [1] still manages to find and choke on
.mailmap, but I haven't been able to think up anything that sounds
likely.  And as Jani pointed out in IRC, rolling back public branches
has its own set of problems [2].

So I've pushed bce5a55c removing .mailmap, and folks without [1]
should be back in business.  Sorry for the excitement :p.

Cheers,
Trevor

[1]: id:4487e001b350aa8e343a1201d869cceca2a03ab6.1508176853.git.wk...@tremily.us
[2]: https://git-scm.com/docs/user-manual#problems-With-rewriting-history

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: nmbug backtrace due to .mailmap

[W. Trevor King]

On Mon, Oct 16, 2017 at 12:21:15PM -0700, W. Trevor King wrote:
> Until then, you can work around the current master by applying this
> patch locally.

I'd thought this thread was in response to my patch, but it turns out
my local nullmailer was off when I sent the patch.  Sent now, and
“this patch” means:

  id:4487e001b350aa8e343a1201d869cceca2a03ab6.1508176853.git.wk...@tremily.us

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: nmbug backtrace due to .mailmap

[David Bremner]

"W. Trevor King"  writes:

> On Mon, Oct 16, 2017 at 10:14:40PM +0300, Jani Nikula wrote:
>> Presumably because of the .mailmap added in nmbug repository:
>
> Yup.
>
>> I also didn't see any discussion about adding a .mailmap prior to it
>> being pushed.
>
> Sorry :/.  I didn't realize it would be an issue until I pushed it.  I
> can't roll it back because the central repo only allows fast-forward
> pushes, but maybe David can revert master to 4148cb4 (dropping
> 5ea99eb)?  Until then, you can work around the current master by
> applying this patch locally.

Reverts are fast-forward?
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Re: nmbug backtrace due to .mailmap

[W. Trevor King]

On Mon, Oct 16, 2017 at 10:14:40PM +0300, Jani Nikula wrote:
> Presumably because of the .mailmap added in nmbug repository:

Yup.

> I also didn't see any discussion about adding a .mailmap prior to it
> being pushed.

Sorry :/.  I didn't realize it would be an issue until I pushed it.  I
can't roll it back because the central repo only allows fast-forward
pushes, but maybe David can revert master to 4148cb4 (dropping
5ea99eb)?  Until then, you can work around the current master by
applying this patch locally.

And if folks feel like this sort of thing should not be supported,
we'll want to reject this patch, document the limitation, and roll
back master to drop 5ea99eb.  I like it, but it's really David's
central repo.

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy


signature.asc
Description: OpenPGP digital signature
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch