From: Junio C Hamano <gitster@pobox.com>
To: Eric Raymond <esr@snark.thyrsus.com>
Cc: git@vger.kernel.org
Subject: Re: git status --porcelain is a mess that needs fixing
Date: Fri, 09 Apr 2010 13:30:39 -0700 [thread overview]
Message-ID: <7vmxxc1i8g.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20100409184608.C7C61475FEF@snark.thyrsus.com> (Eric Raymond's message of "Fri\, 9 Apr 2010 14\:46\:08 -0400 \(EDT\)")
Eric Raymond <esr@snark.thyrsus.com> writes:
> First, the documentation issues, in roughly increasing order of severity:
> ...
These all fall within "Patches welcome" category (meaning: I agree the
documentation can be improved and I don't object to changing them).
> D. How do I tell the conflict/no-conflict cases apart?
> ...
> Illustrative case: I see the status code "DD". How do I distinguish
> between case 4 ("deleted from index") and case 10 ("unmerged, both
> deleted")?
Is that DD really "illustrative", or did you mean to say "only/sole"?
You should never get "DD" in non-conflicting case. I think I was fairly
careful not to make them ambiguous when I did that code, but apparently I
wasn't so careful about the documentation.
Thanks for going through this area with fine comb.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 1cab91b..313dd04 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -86,7 +86,7 @@ and `Y` shows the status of the work tree. For untracked paths, `XY` are
[MD] not updated
M [ MD] updated in index
A [ MD] added to index
- D [ MD] deleted from index
+ D [ M] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
next prev parent reply other threads:[~2010-04-09 20:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 18:46 git status --porcelain is a mess that needs fixing Eric Raymond
2010-04-09 20:30 ` Junio C Hamano [this message]
2010-04-10 4:09 ` Jeff King
2010-04-10 5:46 ` Jonathan Nieder
2010-04-10 5:51 ` Jonathan Nieder
2010-04-10 6:03 ` Jeff King
2010-04-10 6:12 ` Jonathan Nieder
2010-04-10 6:32 ` Jeff King
2010-04-10 5:59 ` Eric Raymond
2010-04-10 7:40 ` [PATCH 0/5] "status --ignored" Junio C Hamano
2010-04-10 7:40 ` [PATCH 1/5] wt-status: remove unused workdir_untracked field Junio C Hamano
2010-04-10 7:40 ` [PATCH 2/5] wt-status: plug memory leak while collecting untracked files Junio C Hamano
2010-04-10 7:40 ` [PATCH 3/5] wt-status: collect ignored files Junio C Hamano
2010-04-10 7:48 ` Jeff King
2010-04-10 7:40 ` [PATCH 4/5] wt-status: rename and restructure status-print-untracked Junio C Hamano
2010-04-10 7:40 ` [PATCH 5/5] status: --ignored option shows ignored files Junio C Hamano
2010-04-10 7:44 ` [PATCH 0/5] "status --ignored" Jeff King
2010-04-10 7:48 ` Junio C Hamano
2010-04-10 8:40 ` Jeff King
2010-04-10 14:41 ` Eric Raymond
2010-04-10 18:27 ` Junio C Hamano
2010-04-10 19:20 ` Jakub Narebski
2010-04-11 10:35 ` Jeff King
2010-04-10 13:35 ` git status --porcelain is a mess that needs fixing Julian Phillips
2010-04-10 14:43 ` Eric Raymond
2010-04-10 14:56 ` Jon Seymour
2010-04-10 15:50 ` Julian Phillips
2010-04-10 23:33 ` Jon Seymour
2010-04-10 19:25 ` [RFC/PATCH] status: Add a new NUL separated output format Julian Phillips
2010-04-10 19:50 ` Eric Raymond
2010-04-10 20:34 ` Julian Phillips
2010-04-10 21:12 ` Eric Raymond
2010-04-10 23:03 ` [RFC/PATCH] status: Add json " Julian Phillips
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=7vmxxc1i8g.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=esr@snark.thyrsus.com \
--cc=git@vger.kernel.org \
/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).