git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Zak Johnson <zakj@nox.cx>
Subject: Re: [PATCH 5/5] status: respect "-b" for porcelain format
Date: Mon, 07 May 2012 21:55:05 -0700	[thread overview]
Message-ID: <7vtxzrz2za.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120507212836.GA19753@sigill.intra.peff.net> (Jeff King's message of "Mon, 7 May 2012 17:28:36 -0400")

Jeff King <peff@peff.net> writes:

> On Mon, May 07, 2012 at 05:25:04PM -0400, Jeff King wrote:
>
>> There is no reason not to, as the user has to explicitly ask
>> for it, so we are not breaking compatibility by doing so. We
>> can do this simply by moving the "show_branch" flag into
>> the wt_status struct. As a bonus, this saves us from passing
>> it explicitly, simplifying the code.
>
> I forgot this, which should probably be squashed in:
>
> -- >8 --
> Subject: status: fix "--porcelain -z -b" documentation
>
> It is no longer the case that "-z" will not respect "-b".
>
> Signed-off-by: Jeff King <peff@peff.net>

All patches looked good.  I thought that this deserved to eventually land
on 'maint', so I did my usual "am first to master primarily to populate
the object database with exact blob objects, then rebase the result to
'maint' while resolving conflicts both textual and semantic, and finally
attempt to merge it back to 'master'" dance to come up with a two topic
branches.  The result is queued in 'pu'.

Thanks.

  reply	other threads:[~2012-05-08  4:55 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-06 13:29 [PATCH] correct git-status Porcelain Format documentation Jeff King
2012-05-06 13:51 ` Jeff King
2012-05-07 18:10   ` Junio C Hamano
2012-05-07 18:13     ` Jeff King
2012-05-07 21:21       ` Jeff King
2012-05-07 21:22         ` [PATCH 1/5] commit: refactor option parsing Jeff King
2012-05-07 21:23         ` [PATCH 2/5] status: refactor colopts handling Jeff King
2012-05-08 13:27           ` Nguyen Thai Ngoc Duy
2012-05-07 21:24         ` [PATCH 3/5] status: refactor null_termination option Jeff King
2012-05-07 21:24         ` [PATCH 4/5] status: fix null termination with "-b" Jeff King
2012-05-07 21:25         ` [PATCH 5/5] status: respect "-b" for porcelain format Jeff King
2012-05-07 21:28           ` Jeff King
2012-05-08  4:55             ` Junio C Hamano [this message]
2012-05-08  9:04               ` Jeff King
2012-05-08 17:52                 ` Junio C Hamano
2012-05-07 18:03 ` [PATCH] correct git-status Porcelain Format documentation Junio C Hamano

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=7vtxzrz2za.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=zakj@nox.cx \
    /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 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 NNTP newsgroup(s).