From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Alan Mackenzie <acm@muc.de>
Subject: Re: [PATCH] docs: add description of status output table
Date: Sun, 10 Jan 2021 01:58:00 +0000 [thread overview]
Message-ID: <X/pfKCV3Pz6cNn1h@camp.crustytoothpaste.net> (raw)
In-Reply-To: <xmqqim85d0vw.fsf@gitster.c.googlers.com>
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
On 2021-01-10 at 01:41:23, Junio C Hamano wrote:
> "brian m. carlson" <sandals@crustytoothpaste.net> writes:
>
> > The table describing the porcelain format in git-status(1) is helpful,
> > but it's not completely clear what the three sections mean, even to
> > some contributors. As a result, users are unable to find how to detect
> > common cases like merge conflicts programmatically.
>
> I agree that the addition clarifies, but it is a bit sad that we
> already have a beginning of the explanation; I wonder if we should
> improve the existing description in addition, even if it may not be
> sufficient to eliminate the need for this new paragraph. Here is
> what we already have:
>
> For paths with merge conflicts, `X` and `Y` show the modification
> states of each side of the merge. For paths that do not have merge
> conflicts, `X` shows the status of the index, and `Y` shows the status
> of the work tree. For untracked paths, `XY` are `??`. Other status
> codes can be interpreted as follows:
>
> This introductory text does sort-of hint that there are three
> classes (merged paths, unmerged paths and untracked paths), but (1)
> the order the three classes are described do not match that of the
> table, and (2) the explanation of the untracked paths predates the
> addition of ignored ones to the untracked class, so the description
> is added after the legends as if an afterthought.
>
> I am actually tempted to suggest rewriting the whole section,
> starting from the paragraph above and ending at the table, with
> something like this:
Sure, I can reroll with that. I noticed that we're using a text diagram
instead of a table, so maybe I can fix that up as well in v2, depending
how the output looks.
--
brian m. carlson (he/him or they/them)
Houston, Texas, US
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2021-01-10 1:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 19:14 Difficulties of scripting git Alan Mackenzie
2021-01-09 21:42 ` brian m. carlson
2021-01-09 22:06 ` [PATCH] docs: add description of status output table brian m. carlson
2021-01-10 1:41 ` Junio C Hamano
2021-01-10 1:58 ` brian m. carlson [this message]
2021-01-10 12:28 ` Alan Mackenzie
2021-01-10 18:32 ` brian m. carlson
2021-01-10 19:04 ` [PATCH v2] docs: rephrase and clarify the git status --short format brian m. carlson
2021-01-11 20:22 ` Junio C Hamano
2021-01-16 21:45 ` brian m. carlson
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=X/pfKCV3Pz6cNn1h@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=acm@muc.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).