Re: nmbug backtrace due to .mailmap

Subject: Re: nmbug backtrace due to .mailmap

Date: Mon, 16 Oct 2017 14:35:56 -0700

To: David Bremner

Cc: notmuch@notmuchmail.org

From: 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.wking@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 (application/pgp-signature)
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

Thread: