From: "Peter Kästle" <peter.kaestle@nokia.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, christian.couder@gmail.com, pc44800@gmail.com
Subject: Re: [PATCH v2] Fix status of initialized but not cloned submodules
Date: Fri, 24 Jan 2020 12:55:25 +0100 [thread overview]
Message-ID: <9192695a-0b3f-d166-7efa-84f57e091c2c@nokia.com> (raw)
In-Reply-To: <xmqq4kwl512y.fsf@gitster-ct.c.googlers.com>
On 23.01.20 22:12, Junio C Hamano wrote:
> Peter Kaestle <peter.kaestle@nokia.com> writes:
>
>> Original bash helper for "submodule status" was doing a check for
>> initialized but not cloned submodules and prefixed the status with
>> a minus sign in case no .git file or folder was found inside the
>> submodule directory.
>> This check was missed when the original port of the functionality
>> from bash to C was done.
>>
>> Signed-off-by: Peter Kaestle <peter.kaestle@nokia.com>
>> ---
>> builtin/submodule--helper.c | 13 ++++++++++++-
>> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> I wonder if this is easily protectable with an additional test.
Yes, please find it inside patch series v3.
> In general, do we have a good coverage of "git status" output that
> involves submodules in various states?
Originally, without applying the v3 series, I can see those testcases:
1) not-init, not-cloned: 'status should initially be "missing"'
2) init, not-cloned: MISSING
3) not-init, cloned: MISSING
4) init, cloned: 'status should be "up-to-date" after update'
4.1) + modified: 'status should be "modified" after submodule commit'
4.2) + modified, committed: 'status should be "up-to-date" after update'
My patch v3 series adds a testcase for 2).
Is 3) even a possible use-case?
Besides that, I think testcases for man git-submodule's description of
status on merge conflicts are missing (...[prefix] U if the submodule
has merge conflicts).
At least, I didn't find any when searching the tests folder with:
$> grep 'grep "^U' *.sh
>
> Thanks.
>
>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>> index c72931e..c04241b 100644
>> --- a/builtin/submodule--helper.c
>> +++ b/builtin/submodule--helper.c
>> @@ -782,6 +782,9 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
>> struct argv_array diff_files_args = ARGV_ARRAY_INIT;
>> struct rev_info rev;
>> int diff_files_result;
>> + struct strbuf buf = STRBUF_INIT;
>> + const char *git_dir;
>> +
>>
>> if (!submodule_from_path(the_repository, &null_oid, path))
>> die(_("no submodule mapping found in .gitmodules for path '%s'"),
>> @@ -794,10 +797,18 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
>> goto cleanup;
>> }
>>
>> - if (!is_submodule_active(the_repository, path)) {
>> + strbuf_addf(&buf, "%s/.git", path);
>> + git_dir = read_gitfile(buf.buf);
>> + if (!git_dir)
>> + git_dir = buf.buf;
>> +
>> + if (!is_submodule_active(the_repository, path) ||
>> + !is_git_directory(git_dir)) {
>> print_status(flags, '-', path, ce_oid, displaypath);
>> + strbuf_release(&buf);
>> goto cleanup;
>> }
>> + strbuf_release(&buf);
>>
>> argv_array_pushl(&diff_files_args, "diff-files",
>> "--ignore-submodules=dirty", "--quiet", "--",
next prev parent reply other threads:[~2020-01-24 11:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 14:02 [PATCH] Fix submodule status of dirs initialized but empty Peter Kästle
2020-01-21 10:12 ` [PATCH v2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-23 21:12 ` Junio C Hamano
2020-01-24 10:34 ` [PATCH v3 1/2] Testcase for submodule status on empty dirs Peter Kaestle
2020-01-24 10:34 ` [PATCH v3 2/2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-24 17:35 ` [PATCH v3 1/2] Testcase for submodule status on empty dirs Junio C Hamano
2020-01-27 9:06 ` [PATCH v4 1/2] t7400: add a testcase " Peter Kaestle
2020-01-27 9:06 ` [PATCH v4 2/2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-27 18:15 ` [PATCH v4 1/2] t7400: add a testcase for submodule status on empty dirs Junio C Hamano
2020-01-28 8:16 ` Peter Kästle
2020-02-02 23:32 ` [PATCH] t7400: testcase for submodule status on unregistered inner git repos Peter Kaestle
2020-01-24 11:55 ` Peter Kästle [this message]
2020-01-24 17:16 ` [PATCH v2] Fix status of initialized but not cloned submodules Junio C Hamano
2020-01-27 8:52 ` Peter Kästle
2020-01-27 18:18 ` Junio C Hamano
2020-02-02 23:16 ` Peter Kästle
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=9192695a-0b3f-d166-7efa-84f57e091c2c@nokia.com \
--to=peter.kaestle@nokia.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pc44800@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).