From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [RFC PATCH] short status: improve reporting for submodule changes
Date: Wed, 15 Mar 2017 22:16:08 -0700 [thread overview]
Message-ID: <CAGZ79kZ7rWw=q6a2AomTw20DsU1h+7ou4i8A14a2bcg+asRwLA@mail.gmail.com> (raw)
In-Reply-To: <xmqqvarac8hc.fsf@gitster.mtv.corp.google.com>
On Wed, Mar 15, 2017 at 6:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> While we already have a porcelain2 layer for git-status, that is accurate
>> for submodules, users still like the way they are are used to of
>> 'status -s'.
>>
>> As a submodule has more state than a file potentially, we'll look at all
>> cases:
>>
>> ------ new submodule commits
>> / ----- modified files
>> | / -- untracked files
>> | | /
>> | | | current / proposed reporting
>> 0 0 0 " " " "
>> 0 0 1 " M" " ?"
>> 0 1 0 " M" " m"
>> 0 1 1 " M" " m"
>> 1 0 0 " M" " M"
>> 1 0 1 " M" " M"
>> 1 1 0 " M" " M"
>> 1 1 1 " M" " M"
>
> You are essentialy saying that there are three levels, 1. with
> commit level difference, 2. the same commit with local mods, 3. no
> mods but with crufts, and instead of wasting 8 letters to express
> all combinations, the highest level is reported, right? That sounds
> OK to me. I am not sure if "?" is a good letter to use (doesn't it
> usually mean it is an untracked cruft?), though.
ok. it helped me, though, to picture all possibilities to come up with
what I consider best for each case. Yes in the end it can be described
as 'report highest bit'.
>
> Does the commit level difference really mean "has new commits"? It
> probably is not new problem but an old mistake inherited from the
> current code, but I suspect that you're just comparing the commit
> bound in the index of the superproject and the HEAD commit in the
> submodule, in which case "newness" does not matter a bit---"is it
> the same or different?" is the question you are asking, I would
> think.
yes, I agree. That is the actual question asked.
>
>
next prev parent reply other threads:[~2017-03-16 5:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 0:33 [RFC PATCH] short status: improve reporting for submodule changes Stefan Beller
2017-03-16 1:31 ` Junio C Hamano
2017-03-16 5:16 ` Stefan Beller [this message]
2017-03-16 20:46 ` [PATCH v2] " Stefan Beller
2017-03-16 22:19 ` Jonathan Nieder
2017-03-16 22:42 ` Stefan Beller
2017-03-16 22:53 ` Jonathan Nieder
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='CAGZ79kZ7rWw=q6a2AomTw20DsU1h+7ou4i8A14a2bcg+asRwLA@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jrnieder@gmail.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).