From: Phillip Wood <phillip.wood123@gmail.com>
To: Sangeeta NB <sangunb09@gmail.com>, phillip.wood@dunelm.org.uk
Cc: Junio C Hamano <gitster@pobox.com>,
kaartic.sivaraam@gmail.com, git@vger.kernel.org
Subject: Re: [Outreachy] Introduction
Date: Thu, 15 Oct 2020 14:39:47 +0100 [thread overview]
Message-ID: <95c90e7a-8f4c-32b9-2b0e-9efce2acfb8e@gmail.com> (raw)
In-Reply-To: <CAHjREB7xhBWHUCJ+T78i6dDGQr055sMAaYzG4gaQSr0T88cseg@mail.gmail.com>
Hi Sangeeta
On 15/10/2020 11:18, Sangeeta NB wrote:
> Hey,
>
>> I've got a fixup which I'll post after this which gets rid of the global
>> flag and instead uses a flag in struct diff_options.
>
> Thanks for the patch, I was thinking about something on similar lines
> but couldn't come up with anything.
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()
> Also, one thing I observed that when I add a printf statement in
> wt-status.c, something like this:
>
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -601,11 +601,11 @@ static void
> wt_status_collect_changes_worktree(struct wt_status *s)
> rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
> rev.diffopt.flags.dirty_submodules = 1;
> rev.diffopt.ita_invisible_in_index = 1;
> + printf("a printf statement\n");
> if (!s->show_untracked_files)
>
> then git status shows output:
>
> sh-3.2$ git status -s -uno --ignore-submodules=none
> a printf statement
> m submod
>
> which is what is expected. But when I comment out the printf statement
> it again gives no output. I couldn't understand why this is taking
> place and how can a printf line modify the behavior of git status.
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.
>> I thinking it would be worth considering if
>> some of them should instead be changed to pass --ignore-submodules=none
>> rather than changing the expected result.
>
> Ya, that's a good suggestion. Would look at those tests again and see
> if I can pass the --ignore-submodules=none option.
For the diff tests I think we want to test the new default and check
that --ignore-submodules=none works. I think for the other tests we
probably want to just add --ignore-submodules=none
I'm afraid I'm still no closer to figuring out why that test in t3600 fails
Phillip
> Thanks
>
next prev parent reply other threads:[~2020-10-15 13:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 20:10 [Outreachy] Introduction Sangeeta NB
2020-10-08 9:07 ` Phillip Wood
2020-10-09 7:41 ` Sangeeta NB
2020-10-09 18:29 ` Phillip Wood
2020-10-11 11:30 ` Sangeeta NB
2020-10-12 10:18 ` Phillip Wood
2020-10-12 11:22 ` Kaartic Sivaraam
2020-10-12 15:57 ` Junio C Hamano
2020-10-14 15:52 ` Sangeeta NB
2020-10-15 9:23 ` Phillip Wood
2020-10-15 9:26 ` [PATCH] fixup! diff: do not show submodule with untracked files as "-dirty" Phillip Wood
2020-10-15 10:18 ` [Outreachy] Introduction Sangeeta NB
2020-10-15 13:39 ` Phillip Wood [this message]
2020-10-15 13:57 ` Sangeeta NB
2020-10-15 14:45 ` Phillip Wood
2020-10-16 5:27 ` Sangeeta NB
2020-10-16 13:26 ` Phillip Wood
-- strict thread matches above, loose matches on Subject: below --
2020-10-10 11:48 Charvi Mendiratta
2020-10-11 8:09 ` Christian Couder
[not found] ` <CAPSFM5cXN57z56Cvq-NX1H4raS7d8=qXEFDQqpypJfoYzbxcyA@mail.gmail.com>
2020-10-15 18:56 ` Charvi Mendiratta
2020-10-15 19:16 ` Junio C Hamano
2020-10-17 8:09 ` Charvi Mendiratta
2020-10-16 8:28 Zodwa Phakathi
2020-10-16 8:46 ` Christian Couder
[not found] ` <CAGdqGXrLN2W_CgqfmfkCSu_hmZ9Ze8A1N9n08bgPRPApSMraSQ@mail.gmail.com>
2020-10-16 10:02 ` Christian Couder
2020-10-16 22:09 Joey S
2020-10-16 23:08 ` Jonathan Nieder
2020-10-17 0:42 ` Joey S
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=95c90e7a-8f4c-32b9-2b0e-9efce2acfb8e@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sangunb09@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).