From: Kirill Smelkov <kirr@landau.phys.spbu.ru>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2009, #03; Wed, 14)
Date: Fri, 16 Jan 2009 11:08:08 +0300 [thread overview]
Message-ID: <20090116080807.GA10792@landau.phys.spbu.ru> (raw)
In-Reply-To: <7vd4eos3rp.fsf@gitster.siamese.dyndns.org>
On Thu, Jan 15, 2009 at 12:39:06PM -0800, Junio C Hamano wrote:
> Kirill Smelkov <kirr@landau.phys.spbu.ru> 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@example.com> (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@example.com> (A U Thor)'
mailinfo: tests for RFC2047 examples
Thanks,
Kirill
next prev parent reply other threads:[~2009-01-16 8:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-14 11:32 What's cooking in git.git (Jan 2009, #03; Wed, 14) Junio C Hamano
2009-01-15 19:49 ` Kirill Smelkov
2009-01-15 20:39 ` Junio C Hamano
2009-01-16 8:08 ` Kirill Smelkov [this message]
2009-01-16 8:21 ` Junio C Hamano
2009-01-16 11:54 ` Johannes Schindelin
2009-01-18 14:54 ` Kirill Smelkov
2009-01-18 18:50 ` John (zzz) Doe <john.doe@xz> (Comment) Junio C Hamano
2009-01-20 19:14 ` Kirill Smelkov
2009-01-21 3:12 ` Junio C Hamano
2009-01-21 20:30 ` Kirill Smelkov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090116080807.GA10792@landau.phys.spbu.ru \
--to=kirr@landau.phys.spbu.ru \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.