From: Phillip Wood Date: Thu, 15 Oct 2020 14:45:53 GMT Subject: Re: [Outreachy] Introduction Message-ID: <8c9b409b-4e44-ca8a-9075-36a7332f9765@gmail.com> In-Reply-To: Hi Sangeeta On 15/10/2020 14:57, Sangeeta NB wrote: > On Thu, Oct 15, 2020 at 7:09 PM Phillip Wood wrote: > Hey Phillip, > >> As we store the config options in default_diff_options and then copy >> them across at the beginning of repo_setup_diff() we can use a flag in >> struct diff_options which is set by handle_ignore_submodule_arg() to >> tell if we need to initialize opts->flags.ignore_untracked_in_submodules >> in repo_setup_diff() > > Even if we don't set a global flag it is working fine because we are > setting the default first, and would let the config override it. I > have updated the code in the PR and you can have a look at it. I have > also added --ignore-submodules=none in some tests to get the results > mentioned earlier. Thanks, I'll have a look later >> Are you adding the printf and then running t3600? If so then the extra >> line of output breaks a lot of tests which in turn breaks to setup for >> the test that was failing so there are uncommitted changes. >> Unfortunately it is hard to run a subset of tests in a lot the test >> scripts as there are implicit dependencies between the individual tests >> them. >> > Oh, okay it makes sense. > >> >> I'm afraid I'm still no closer to figuring out why that test in t3600 fails diff --git a/submodule.c b/submodule.c index 8f6227c993..c4182be633 100644 --- a/submodule.c +++ b/submodule.c @@ -1679,6 +1679,8 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) strvec_pushl(&cp.args, "status", "--porcelain=2", NULL); if (ignore_untracked) strvec_push(&cp.args, "-uno"); + else + strvec_push (&cp.args, "--ignore-submodules=none"); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; fixes it, I'm unsure at the moment if we should be adding the extra flag here or setting the appropriate option in status when -uno and --ignore-submodules=