From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Zak Johnson <zakj@nox.cx>
Subject: Re: [PATCH 5/5] status: respect "-b" for porcelain format
Date: Mon, 7 May 2012 17:28:36 -0400 [thread overview]
Message-ID: <20120507212836.GA19753@sigill.intra.peff.net> (raw)
In-Reply-To: <20120507212504.GE19567@sigill.intra.peff.net>
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>
---
Documentation/git-status.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 2883a28..67e5f53 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -184,7 +184,7 @@ order is reversed (e.g 'from \-> to' becomes 'to from'). Second, a NUL
and the terminating newline (but a space still separates the status
field from the first filename). Third, filenames containing special
characters are not specially formatted; no quoting or
-backslash-escaping is performed. Fourth, there is no branch line.
+backslash-escaping is performed.
CONFIGURATION
-------------
--
1.7.10.1.12.gd79f7ab
next prev parent reply other threads:[~2012-05-07 21:28 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 [this message]
2012-05-08 4:55 ` Junio C Hamano
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=20120507212836.GA19753@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).