git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: Peter Kaestle <peter.kaestle@nokia.com>,
	Git mailing list <git@vger.kernel.org>,
	Eric Sunshine <sunshine@sunshineco.us>,
	Ralf Thielow <ralf.thielow@gmail.com>
Subject: Re: [PATCH v2] submodules: fix of regression on fetching of non-init subsub-repo
Date: Mon, 07 Dec 2020 11:43:13 -0800	[thread overview]
Message-ID: <xmqqpn3l9zce.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <613FAD04-0D5A-4DE0-8FE8-0C5C5619B7BC@gmail.com> (Philippe Blain's message of "Mon, 7 Dec 2020 13:42:08 -0500")

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> Maybe a personal preference, but I would have gone for something a
> little simpler, like the following:
>
> diff --git a/submodule.c b/submodule.c
> index b3bb59f066..4200865174 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1486,7 +1486,7 @@ static int get_next_submodule(struct child_process *cp,
>                          * the submodule is not initialized
>                          */
>                         if (S_ISGITLINK(ce->ce_mode) &&
> -                           !is_empty_dir(ce->name)) {
> +                           !is_empty_dir(repo_worktree_path(spf->r, "%s", ce->name))) {

But then you leak the return value from repo_worktree_path(), no?

>> +test_expect_success 'recursive fetch with uninit submodule' '
>> +	# depends on previous test for setup
>> +
>> +	git -C main submodule deinit -f sub &&
>
> Here you are deiniting the submodule, such that 
> the Git directory will stay in .git/modules/sub. This is not the same thing
> as a submodule that was never initialized ("uninitialized"), for which .git/modules/sub
> will not yet exist. So maybe we could harden the tests by also testing
> for that scenario ? I don't know... maybe the infinite loop only happens
> if .git/modules/sub actually already exists. If so, the test name should be
> "recursive fetch with deinitialized submodule", I think.

Even if the original breakage happens only for deinitialized case,
it would be sensible to test uninitialized one as well, I would
think.

> Thanks for working on that, and sorry for not having the time to comment before
> you sent v2.

Thanks, all.  

It's not like we corral everybody to a single place on a single day
to work on a single thing.  Reviews ov v2 by reviewers who have not
seen v1 is totally expected and very much appreciated.

  reply	other threads:[~2020-12-07 19:44 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-02 15:56 BUG in fetching non-checked out submodule Ralf Thielow
2020-12-02 17:19 ` Philippe Blain
2020-12-02 23:06   ` Junio C Hamano
2020-12-03  7:54     ` Peter Kästle
2020-12-03 15:25       ` Philippe Blain
2020-12-03 15:33         ` Peter Kästle
2020-12-03 18:12           ` Junio C Hamano
2020-12-04 15:23           ` [PATCH] submodules: fix of regression on fetching of non-init subsub-repo Peter Kaestle
2020-12-04 18:06             ` Eric Sunshine
2020-12-07  8:28               ` Peter Kästle
2020-12-07  8:40                 ` Eric Sunshine
2020-12-07 13:46                   ` [PATCH v2] " Peter Kaestle
2020-12-07 18:42                     ` Philippe Blain
2020-12-07 19:43                       ` Junio C Hamano [this message]
2020-12-08  8:46                         ` Peter Kästle
2020-12-07 19:56                       ` Junio C Hamano
2020-12-08 14:06                       ` Peter Kästle
2020-12-07 19:22                     ` Junio C Hamano
2020-12-07 20:44                       ` Philippe Blain
2020-12-07 21:02                         ` Junio C Hamano
2020-12-07 21:10                           ` Junio C Hamano
2020-12-08 14:58                       ` Peter Kästle
2020-12-08 15:42                         ` [PATCH v3] " Peter Kaestle
2020-12-08 15:51                           ` Peter Kästle
2020-12-08 20:46                           ` Junio C Hamano
2020-12-08 23:25                           ` Philippe Blain
2020-12-09  9:58                             ` Peter Kästle
2020-12-09 10:58                               ` [PATCH v4] " Peter Kaestle
2020-12-09 14:00                                 ` Philippe Blain
2020-12-03  7:45   ` BUG in fetching non-checked out submodule Ralf Thielow
2020-12-03  8:20     ` Peter Kästle
2020-12-03  9:38       ` Ralf Thielow
2020-12-03  9:43         ` Peter Kästle
2020-12-03 12:30           ` Ralf Thielow
2020-12-03 15:10             ` Peter Kästle
2020-12-03 16:45               ` Ralf Thielow

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqpn3l9zce.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=levraiphilippeblain@gmail.com \
    --cc=peter.kaestle@nokia.com \
    --cc=ralf.thielow@gmail.com \
    --cc=sunshine@sunshineco.us \
    /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.
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 NNTP newsgroup(s).