[PATCH] nmbug: only push master branch on nmbug push
Jani Nikula writes: > nmbug pull only merges upstream master, but nmbug push tries to push > all local branches. The asymmetry results in conflicts whenever there > have been changes in the config branch in the origin: LGTM d
the future of notmuch-vim?
David Bremner writes: > I'm not sure what, if anything to do about the vim frontend. > So, nobody has jumped to the defence of the vim plugin. Unless some better idea emerges in the next week or so, I plan to move it to the contrib/ directory and mark it as deprecated in NEWS. d
another bug fix release: 0.15.2, in progress.
david at tethera.net writes: > I plan to do another quick bug fix release, with aidecoe's parallel > build fix and a patch originally from Tomi to make the Emacs tests not > commit suicide right away on certain OSes. > > I didn't include the parallel building patch here since it's already > in master. Apparently not so quick. I've been busy, and it turned out the bug I fixed in the Hurd build process revealed another bug, I think in Emacs, namely that emacs on Hurd segfaults running the notmuch test suite. Anyway, I guess we may as well push these fixes out; I'm a bit curious if Robert is going to revise id:1359917491-17178-1-git-send-email-beheerder at tekenbeetziekten.nl in the near future; in that case I might include that fix as well. d
Bug: problem decoding some non-ascii characters in subjects
On Sat, 09 Feb 2013, Albin Stjerna wrote:
> Jani Nikula wrote:
>
>> On Fri, 08 Feb 2013, Albin Stjerna wrote:
>> > I've been noticing that notmuch has some problems decoding certain
>> > strangely-encoded non-ascii characters in certain emails. For example,
>> > today I got this: [BIBLIST] Digitaliseringensprojektens skadliga
>> > f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet (should be
>> > rendered: ?Digitaliseringsprojektens skadliga f?rk?rlek f?r
>> > PDF-formatet?).
>> >
>> > Apparently, some metadata is passed on to help the MUA decode the
>> > string, but notmuch doesn't seem to handle it. Entire emails can of
>> > course be supplied as needed.
>
>> Please copy paste the Subject: header directly from the message file.
>
> The exact Subject: header (from the file, not notmuch) is:
> Subject: [BIBLIST] Digitaliseringensprojektens skadliga
> f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet
Is that entirely on one line in the original message file? If not, where
exactly is it split?
Either way, at a glance, it seems like the encoding is malformed. I
think the encoded-word ("=?" charset "?" encoding "?" encoded-text "?=")
should be separated by space to make it an atom. [RFC 2047, RFC 2822].
If you manually move the leading 'f' after the "?Q?" bit, it works as
expected. It looks like the bug is in the sender's user agent.
BR,
Jani.
Bug: problem decoding some non-ascii characters in subjects
Jani Nikula wrote: > On Fri, 08 Feb 2013, Albin Stjerna wrote: > > I've been noticing that notmuch has some problems decoding certain > > strangely-encoded non-ascii characters in certain emails. For example, > > today I got this: [BIBLIST] Digitaliseringensprojektens skadliga > > f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet (should be > > rendered: ?Digitaliseringsprojektens skadliga f?rk?rlek f?r > > PDF-formatet?). > > > > Apparently, some metadata is passed on to help the MUA decode the > > string, but notmuch doesn't seem to handle it. Entire emails can of > > course be supplied as needed. > Please copy paste the Subject: header directly from the message file. The exact Subject: header (from the file, not notmuch) is: Subject: [BIBLIST] Digitaliseringensprojektens skadliga f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet Other potentially interesting headers are: User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed (formatted as they appeared in the mail file)
Re: Bug: problem decoding some non-ascii characters in subjects
Jani Nikula wrote: On Fri, 08 Feb 2013, Albin Stjerna albin.stje...@gmail.com wrote: I've been noticing that notmuch has some problems decoding certain strangely-encoded non-ascii characters in certain emails. For example, today I got this: [BIBLIST] Digitaliseringensprojektens skadliga f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet (should be rendered: »Digitaliseringsprojektens skadliga förkärlek för PDF-formatet«). Apparently, some metadata is passed on to help the MUA decode the string, but notmuch doesn't seem to handle it. Entire emails can of course be supplied as needed. Please copy paste the Subject: header directly from the message file. The exact Subject: header (from the file, not notmuch) is: Subject: [BIBLIST] Digitaliseringensprojektens skadliga f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet Other potentially interesting headers are: User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed (formatted as they appeared in the mail file) ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
Re: Bug: problem decoding some non-ascii characters in subjects
On Sat, 09 Feb 2013, Albin Stjerna albin.stje...@gmail.com wrote: Jani Nikula wrote: On Fri, 08 Feb 2013, Albin Stjerna albin.stje...@gmail.com wrote: I've been noticing that notmuch has some problems decoding certain strangely-encoded non-ascii characters in certain emails. For example, today I got this: [BIBLIST] Digitaliseringensprojektens skadliga f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet (should be rendered: »Digitaliseringsprojektens skadliga förkärlek för PDF-formatet«). Apparently, some metadata is passed on to help the MUA decode the string, but notmuch doesn't seem to handle it. Entire emails can of course be supplied as needed. Please copy paste the Subject: header directly from the message file. The exact Subject: header (from the file, not notmuch) is: Subject: [BIBLIST] Digitaliseringensprojektens skadliga f=?ISO-8859-1?Q?=F6rk=E4rlek_f=F6r_?= PDF-formatet Is that entirely on one line in the original message file? If not, where exactly is it split? Either way, at a glance, it seems like the encoding is malformed. I think the encoded-word (=? charset ? encoding ? encoded-text ?=) should be separated by space to make it an atom. [RFC 2047, RFC 2822]. If you manually move the leading 'f' after the ?Q? bit, it works as expected. It looks like the bug is in the sender's user agent. BR, Jani. ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH] nmbug: only push master branch on nmbug push
nmbug pull only merges upstream master, but nmbug push tries to push
all local branches. The asymmetry results in conflicts whenever there
have been changes in the config branch in the origin:
$ nmbug push
To nm...@nmbug.tethera.net:nmbug-tags
! [rejected]config - config (non-fast-forward)
error: failed to push some refs to 'nm...@nmbug.tethera.net:nmbug-tags'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration
hint: variable to 'current' or 'upstream' to push only the current branch.
'git push origin' exited with nonzero value
To fix this, only push the master branch on nmbug push. Any config
changes need to be done manually via git anyway.
---
contrib/nmbug/nmbug |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/nmbug/nmbug b/contrib/nmbug/nmbug
index f003ef9..fe103b3 100755
--- a/contrib/nmbug/nmbug
+++ b/contrib/nmbug/nmbug
@@ -331,7 +331,7 @@ sub do_log {
sub do_push {
my $remote = shift || 'origin';
- git ('push', $remote);
+ git ('push', $remote, 'master');
}
--
1.7.10.4
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
