From: Sangeeta NB <sangunb09@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [Outreachy] [PATCH v4] diff: do not show submodule with untracked files as "-dirty"
Date: Sun, 25 Oct 2020 15:53:49 +0530 [thread overview]
Message-ID: <CAHjREB6fC6j30MH1Lb7enE3KJaGdX--Ft8+hwVeDfwApab5FNQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqmu0cfx9a.fsf@gitster.c.googlers.com>
On Sat, Oct 24, 2020 at 2:58 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Sangeeta Jain <sangunb09@gmail.com> writes:
>
> > diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
> > ...
> > +test_expect_success 'git diff HEAD with dirty submodule (untracked) (none ignored)' '
> > + git config diff.ignoreSubmodules none &&
> > + git diff HEAD >actual &&
> > + sed -e "1,/^@@/d" actual >actual.body &&
> > + expect_from_to >expect.body $subtip $subprev-dirty &&
> > + test_cmp expect.body actual.body &&
> > + git config --unset diff.ignoreSubmodules
> > +'
>
> If any step concatenated by && in the above sequence fails, the test
> repository will have diff.ignoreSubmodules set to none (without
> getting it reset, since &&-chain prevents the last "config --unset"
> step from running). Unless the test is run under the --immediate
> option, that would affect the environment in which subsequent tests
> are run.
>
> Instead, our test usually do this:
>
> test_expect_success 'test title' '
> test_config diff.ignoresubmodules none &&
> git diff HEAD >actual &&
> ...
> test_cmp expect.body actual.body
> '
>
> "test_config" sets up a trigger, which will _always_ fire, whether
> the test fails at any intermediate steps or runs to the end and
> succeeds, to remove the configuration it just added. It is a
> short-hand for writing
>
> test_when_finished test_unconfig diff.ignoresubmodules &&
> git config diff.ignoresubmodules none
>
> i.e. to use test_when_finished to set up the trigger.
>
Oh, okay! I would make these changes. Thanks for the explanation.
There are also other places where `git config` is used in test
scripts. Should I change that too? Or maybe as they are not relevant
to this patch, we can create an issue or even a microproject for other
first-timer contributors?
> > - git diff HEAD >actual &&
> > + git diff --ignore-submodules=none HEAD >actual &&
> > sed -e "1,/^@@/d" actual >actual.body &&
> > expect_from_to >expect.body $subprev $subprev-dirty &&
> > test_cmp expect.body actual.body &&
> > git diff --ignore-submodules=all HEAD >actual2 &&
> > test_must_be_empty actual2 &&
> > - git diff --ignore-submodules=untracked HEAD >actual3 &&
> > + git diff HEAD >actual3 &&
>
> This line can be left as-is, no?
Ya, they can be left as it is but I removed the
--ignore-submodules=untracked because we also have to check the
default git behavior and adding that doesn't change anything in the
code so I removed that.
In general, in all the tests I followed this practice:
1. I added --ignore-submodules=none where there were no options
specified(as this was the earlier default)
2. I removed --ignore-submodules=untracked(as this should even work if
no options are specified)
I would put that back if you still want it?
Thanks and Regards,
next prev parent reply other threads:[~2020-10-25 10:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 17:08 [PATCH] diff: do not show submodule with untracked files as "-dirty" Sangeeta via GitGitGadget
2020-10-20 13:38 ` [OUTREACHY][PATCH] " Phillip Wood
2020-10-20 18:10 ` Sangeeta NB
2020-10-21 11:28 ` Phillip Wood
2020-10-21 13:10 ` [Outreachy] [PATCH v2] " Sangeeta Jain
2020-10-21 17:43 ` Eric Sunshine
2020-10-21 19:40 ` Sangeeta NB
2020-10-21 23:04 ` Eric Sunshine
2020-10-22 11:22 ` [Outreachy] [PATCH v3] " Sangeeta Jain
2020-10-22 18:07 ` Junio C Hamano
2020-10-23 5:23 ` Sangeeta NB
2020-10-23 15:19 ` Junio C Hamano
2020-10-23 18:17 ` Sangeeta NB
2020-10-23 18:55 ` Junio C Hamano
2020-10-23 19:08 ` Sangeeta NB
2020-10-23 11:17 ` [PATCH v4] " Sangeeta Jain
2020-10-23 15:56 ` Junio C Hamano
2020-10-23 18:32 ` Sangeeta NB
2020-10-23 20:22 ` Junio C Hamano
2020-10-23 11:18 ` [Outreachy] " Sangeeta Jain
2020-10-23 21:28 ` Junio C Hamano
2020-10-25 10:23 ` Sangeeta NB [this message]
2020-10-26 17:36 ` Junio C Hamano
2020-10-23 19:29 ` [Outreachy] [PATCH v5] " Sangeeta Jain
2020-10-26 17:57 ` [Outreachy][PATCH v6] " Sangeeta Jain
2020-11-03 10:46 ` Sangeeta
2020-11-03 17:55 ` Junio C Hamano
2020-11-07 10:47 ` Sangeeta
2020-12-08 21:02 ` Junio C Hamano
2020-11-07 11:10 ` Đoàn Trần Công Danh
2020-11-09 15:19 ` Sangeeta
2020-11-09 17:01 ` Junio C Hamano
2020-11-10 8:39 ` [Outreachy][PATCH v7] " Sangeeta Jain
2020-11-10 17:09 ` Đoàn Trần Công Danh
2020-12-08 13:36 ` Sangeeta
2020-12-08 22:26 ` Junio C Hamano
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=CAHjREB6fC6j30MH1Lb7enE3KJaGdX--Ft8+hwVeDfwApab5FNQ@mail.gmail.com \
--to=sangunb09@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).