git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Julien Richard via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org, Julien Richard <jairbubbles@hotmail.com>,
	Julien Richard <julien.richard@ubisoft.com>
Subject: Re: [PATCH] doc: 'T' status code for git status
Date: Wed, 9 Dec 2020 16:32:02 -0500	[thread overview]
Message-ID: <X9FCUseRteZ1n7ec@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqsg8e20b8.fsf@gitster.c.googlers.com>

On Wed, Dec 09, 2020 at 12:26:19PM -0800, Junio C Hamano wrote:

> A few things about the attached.
> 
>  - it drops "updated but" from the explanation of 'U' in the list.

Seems reasonable.

>  - after that, everything in the list becomes a single-word, so
>    instead of "type changed", it invents a verb "type-change" and
>    uses its pp. form when adding an entry for 'T'.

Also reasonable.

>  - it updates the table to add 'T' next to 'M'.

Yep, that was what I was thinking would make sense.

>  - "work tree changed since index" in the table was awkward; it
>    rephrases it to "modified in work tree relative to index",
>    because (1) these entries are not talking about the working tree
>    as a whole; it is one path in the working tree changing its
>    type. and (2) using "changed" and "updated" for the same 'M' in
>    different context was unnecessarily confusing.  Instead, it uses
>    'modified', which appears in the list before the table.

The first line seems funny to me now, though (diff abridged):

> -	 [AMD]   not updated
> +        [AMTD]   not changed

If the file is not changed, then why are we even mentioning it? Because
of course it _is_ changed in the filesystem, but the index was not
updated to reflect the change. And that's what I think the original was
getting at with "updated".

TBH, I find the whole table overly confusing. But then, I am completely
comfortable with the notion that it is really showing two diffs, with
their results collated. To me it is simpler to just discuss the two
sides of the diff independently, and then you do not even really need a
table at all ("M" means modified no matter which column it appears in).
But I may not be a representative Git user.

-Peff

  parent reply	other threads:[~2020-12-09 21:34 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-09  8:13 [PATCH] doc: 'T' status code for git status Julien Richard via GitGitGadget
2020-12-09 17:37 ` Jeff King
2020-12-09 18:01   ` Julien Richard
2020-12-09 18:35     ` Jeff King
2020-12-09 20:26   ` Junio C Hamano
2020-12-09 20:56     ` Julien Richard
2020-12-09 21:32     ` Jeff King [this message]
2020-12-10  0:47       ` Junio C Hamano
2020-12-09 19:12 ` [PATCH v2] " Julien Richard via GitGitGadget

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=X9FCUseRteZ1n7ec@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=jairbubbles@hotmail.com \
    --cc=julien.richard@ubisoft.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).