On Thu, Jan 15, 2009 at 12:39:06PM -0800, Junio C Hamano wrote:
> Kirill Smelkov <kirr@xxxxxxxxxxxxxxxxxxx> writes:
>
> > Sorry for the inconvenience, and please pull them all from
> >
> > git://repo.or.cz/git/kirr.git for-junio
> >
> > Kirill Smelkov (4):
> > mailinfo: 'From:' header should be unfold as well
> > mailinfo: more smarter removal of rfc822 comments from 'From'
> > mailinfo: correctly handle multiline 'Subject:' header
> > mailinfo: add explicit test for mails like '<a.u.thor@xxxxxxxxxxx> (A U Thor)'
>
> Sorry, but I cannot _pull_ this one; not because these four patches are
> bad (I haven't looked at them).
>
> They include all the other totally unrelated stuff that happend on the
> master branch since the topic ks/maint-mailinfo-folded forked. I've been
> hoping upon completion of this topic we can merge it down to maint to
> propagate the fix back to v1.6.1.X series.
>
> With this alias:
>
> $ git config alias.lg log --pretty=oneline --abbrev-commit --boundary --left-right
>
> Here are what I have queued so far (and they are in next):
>
> $ git lg master..ks/maint-mailinfo-folded
> >ddfb369... mailinfo: 'From:' header should be unfold as well
> >353aaf2... mailinfo: correctly handle multiline 'Subject:' header
> -141201d... Merge branch 'maint-1.5.6' into maint-1.6.0
>
> $ git lg maint..ks/maint-mailinfo-folded
> >ddfb369... mailinfo: 'From:' header should be unfold as well
> >353aaf2... mailinfo: correctly handle multiline 'Subject:' header
> -141201d... Merge branch 'maint-1.5.6' into maint-1.6.0
>
> 141201d is only three commits ahead of v1.6.0.6 and
>
> $ git lg v1.6.0.6..141201d
>
> will show that we _could_ even issue v1.6.0.7 with the fixes in this topic
> if we cared about this bug deeply enough. If I pull the above to the
> topic, we'll lose the ability to propagate these fixes to the maintenance
> serires.
>
> So please either say "Yes, you are welcome to cherry-pick -- fetching and
> cherry-picking would be easier than e-mail for this kind of patch", or
> "Ok, I'll rebase my series on top of ddfb369".
>
> Well, I just noticed that some of your commits already conflict with the
> two patches that I already have, so I guess we would need at least one
> rebase anyway, so this time around, I'd really prefer you not to say "you
> are welcome to cherry-pick" ;-)
Sure, I've rebased my series on top of ddfb369 :)
git://repo.or.cz/git/kirr.git for-junio-maint
Kirill Smelkov (3):
mailinfo: more smarter removal of rfc822 comments from 'From'
mailinfo: add explicit test for mails like '<a.u.thor@xxxxxxxxxxx> (A U Thor)'
mailinfo: tests for RFC2047 examples
Thanks,
Kirill
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
