From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org, "W. Trevor King" <wking@tremily.us>
Subject: nmbug backtrace due to .mailmap
Date: Mon, 16 Oct 2017 22:14:40 +0300 [thread overview]
Message-ID: <87lgkasy5b.fsf@nikula.org> (raw)
Presumably because of the .mailmap added in nmbug repository:
commit 5ea99ebcb7d188003bf4854b566f6d21721f5ea1
Author: W. Trevor King <wking@tremily.us>
Date: Mon Oct 16 10:46:27 2017 -0700
.mailmap: Consolidate David and Tomi's author names
The format is documented in git-shortlog(1). In both cases, I've
prefered the email used for their most-recent commit.
A .mailmap
I now get backtrace trying to nmbug pull:
Traceback (most recent call last):
File "/home/jani/bin/nmbug", line 834, in <module>
args.func(**kwargs)
File "/home/jani/bin/nmbug", line 433, in pull
_insist_committed()
File "/home/jani/bin/nmbug", line 412, in _insist_committed
status = get_status()
File "/home/jani/bin/nmbug", line 580, in get_status
maybe_deleted = _diff_index(index=index, filter='D')
File "/home/jani/bin/nmbug", line 658, in _diff_index
for id, tag in _unpack_diff_lines(stream=p.stdout):
File "/home/jani/bin/nmbug", line 678, in _unpack_diff_lines
'Invalid line in diff: {!r}'.format(line.strip()))
ValueError: Invalid line in diff: u'.mailmap'
I also didn't see any discussion about adding a .mailmap prior to it
being pushed.
BR,
Jani.
next reply other threads:[~2017-10-16 19:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 19:14 Jani Nikula [this message]
2017-10-16 19:21 ` nmbug backtrace due to .mailmap 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
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=87lgkasy5b.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=wking@tremily.us \
/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).