From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Subject: Re: [PATCH] ls-files: support --recurse-submodules --stage
Date: Mon, 21 Feb 2022 19:51:47 +0100 [thread overview]
Message-ID: <220221.86ley4aw88.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqk0dot74j.fsf@gitster.g>
On Mon, Feb 21 2022, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> This test though will break, as you can see with:
>>
>> GIT_TEST_DEFAULT_HASH=sha256 ./t3007-ls-files-recurse-submodules.sh
>>
>> So you'll need at least something like:
>>
>> diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh
>> index 3d2da360d17..0fe69da8dcf 100755
>> --- a/t/t3007-ls-files-recurse-submodules.sh
>> +++ b/t/t3007-ls-files-recurse-submodules.sh
>> @@ -42,10 +42,10 @@ test_expect_success '--stage' '
>> echo brigddsv >submodule/c &&
>> git -C submodule commit -am "update c again" &&
>>
>> - cat >expect <<-\EOF &&
>> - 100644 6da7 0 .gitmodules
>> - 100644 7898 0 a
>> - 100644 6178 0 b/b
>> + cat >expect <<-EOF &&
>> + 100644 $(git rev-parse --short=4 HEAD:.gitmodules) 0 .gitmodules
>> + 100644 $(git rev-parse --short=4 HEAD:a) 0 a
>> + 100644 $(git rev-parse --short=4 HEAD:b/b) 0 b/b
>> 100644 dead9 0 submodule/c
>> EOF
>>
>> But then the problem is that one is dead9 and the other dead6, I was
>> just trying to find 4-char prefixes.
>>
>> But having indulged in all that, I'm now entirely confused about why any
>> of this needs to be tested here.
>>
>> You're adding --stage, which will give us --stage-y output, and it was
>> previously incompatible with --recurse-submodules. Having the two
>> combine is good!
>
> I think what this is trying to make sure is that it (1) enabled the
> combination and (2) uses the object store of the submodule when
> disambiguating names of the objects from the submodule, because the
> author suspects that the reason why these two options were made
> incompatible in the first place was because long time ago there
> wasn't a way to ask "here is an object name---please uniquify in the
> context of _that_ repository". So it is understandable to prepare
> an object X in a submodule and another object Y in the superproject,
> such that the abbreviated name of X in the context of the submodule
> is different from the abbreviated name of X in the context of the
> superproject (i.e. if X were in the superproject's object store,
> because the object names of X and Y share the prefix, it may require
> longer prefix to disambiguate from Y), and make sure that the uniquify
> is indeed happening in the context of the submodule.
>
> So, you are only concentrating on (1) but forgetting why the author
> wants (2).
Indeed. That makes sense, but it would really help to e.g. have the test
description make that goal explicit.
next prev parent reply other threads:[~2022-02-21 18:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 22:32 [PATCH] ls-files: support --recurse-submodules --stage Jonathan Tan
2022-02-19 0:33 ` Junio C Hamano
2022-02-19 3:11 ` Ævar Arnfjörð Bjarmason
2022-02-19 3:50 ` Taylor Blau
2022-02-21 18:19 ` Junio C Hamano
2022-02-21 18:51 ` Ævar Arnfjörð Bjarmason [this message]
2022-02-24 0:11 ` Jonathan Tan
2022-02-21 1:48 ` Junio C Hamano
2022-02-21 2:45 ` Taylor Blau
2022-02-24 0:23 ` [PATCH v2] " Jonathan Tan
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=220221.86ley4aw88.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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).