From: Phillip Wood <phillip.wood123@gmail.com>
To: Sangeeta NB <sangunb09@gmail.com>, phillip.wood@dunelm.org.uk
Cc: Sangeeta via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org
Subject: Re: [OUTREACHY][PATCH] diff: do not show submodule with untracked files as "-dirty"
Date: Wed, 21 Oct 2020 12:28:37 +0100 [thread overview]
Message-ID: <d9376318-b8dd-3e30-8aa9-255eefe727c4@gmail.com> (raw)
In-Reply-To: <CAHjREB7Xhga3da9vGyXxJo6MCi9P9CyezzO66Xh2X2+rDFkQjw@mail.gmail.com>
Hi Sangeeta
On 20/10/2020 19:10, Sangeeta NB wrote:
> Hey Phillip,
>
>> I think we require your full name on the From line to match the
>> Signed-off-by line below (c.f.
>> https://lore.kernel.org/git/xmqqpn5dd5dv.fsf@gitster.c.googlers.com)
>
>> That is a good summary of the issue that this change addresses, we
>> normally wrap lines at 72 characters though.
>
> This was sent by gitgitgadget so I am unable to find how I can
> customize it. Can you help me with this? Or else I have set the Travis
> so should I send another patch using send-email?
When you create the commit message you need to get your editor to wrap
the lines with line breaks, how you do this depends on your editor - for
emacs you can use fill-paragraph, in vim 'gq' you should be able to
google it for your editor.
It would be a good idea to add [Outreachy] to the beginning of the
commit subject line as well so people can easily find outreachy related
patches on the list (anything inside [] is removed by `git am` when the
patch is applied)
>> This unconditionally overrides diff.ignoreSubmodules, grepping seems to
>> show that we don't have any tests that test a config value of "none".
>> There are a few that check "dirty" which we should look at to consider
>> if they still add value now we've changed the default.
>
> Yes, sorry, noticed it now. I have now added a flag in diff_flags.
> Also, do I have to add tests that check whether diff.ignoreSubmodules
> is not being overwritten?
I think adding a test that checks diff.ignoreSubmodules=none is
respected would be a good idea
>
>> if (diff_no_prefix) {
>> options->a_prefix = options->b_prefix = "";
>> diff --git a/submodule.c b/submodule.c
>> index b3bb59f066..762298c010 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -1678,6 +1678,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");
>>
>> We need to do this as a consequence of changing the default for
>> '--ignore-submodules`, we should think what the consequences are for
>> other users of `git status` and whether we need to do something similar
>> there if diff.ignoreSubmodules is not set.
>>
>
> Oh okay. I understood what you said. But I couldn't figure out how to
> do that.
I'm not sure if we need to do this or not, I was hoping to get some
input from the list
> As all the tests of status were passing so I don't think
> there might be any issue with this.
Possibly, though I think it is more likely that we're not testing
anything that gets broken by this change.
Best Wishes
Phillip
>> I think we want to keep testing that we get the correct output when
>> --ignore-submodules=none as well as maybe adding a couple of new tests
>> that check the default in this file, rather than changing the expected
>> output.
>>
>
> Thanks, I have added more tests.
>
> Thanks and Regards,
> Sangeeta
>
next prev parent reply other threads:[~2020-10-21 11:28 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 [this message]
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
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
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=d9376318-b8dd-3e30-8aa9-255eefe727c4@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@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).