From: "W. Trevor King" <wking@tremily.us>
To: David Bremner <david@tethera.net>
Cc: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
Subject: Re: nmbug backtrace due to .mailmap
Date: Mon, 16 Oct 2017 14:35:56 -0700 [thread overview]
Message-ID: <20171016213556.GA26354@valgrind.us> (raw)
In-Reply-To: <20171016210817.GF11004@valgrind.tremily.us>
[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-10-16 21:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 19:14 nmbug backtrace due to .mailmap Jani Nikula
2017-10-16 19:21 ` W. Trevor King
2017-10-16 20:37 ` David Bremner
2017-10-16 21:08 ` W. Trevor King
2017-10-16 21:35 ` W. Trevor King [this message]
2017-10-22 8:50 ` Jani Nikula
2017-10-16 20:39 ` W. Trevor King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171016213556.GA26354@valgrind.us \
--to=wking@tremily.us \
--cc=david@tethera.net \
--cc=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).