From: Phillip Wood <phillip.wood123@gmail.com>
To: Sangeeta NB <sangunb09@gmail.com>, phillip.wood@dunelm.org.uk
Cc: git@vger.kernel.org
Subject: Re: [Outreachy] Introduction
Date: Mon, 12 Oct 2020 11:18:33 +0100 [thread overview]
Message-ID: <eb1d6d2a-868f-7d1a-e004-30efc1950d9a@gmail.com> (raw)
In-Reply-To: <CAHjREB6j6BqZ49wX5uqEOiysTAm8Oo7N=EFpcoovWKkBghBjxQ@mail.gmail.com>
Hi Sangeeta
On 11/10/2020 12:30, Sangeeta NB wrote:
> Thanks for the help, Philip.
>
> On Fri, Oct 9, 2020 at 11:59 PM Phillip Wood <phillip.wood123@gmail.com> wrote:
>
>> I struggled to find the mircoprojects page - I must have missed the link
>> on the outreachy site.
>
> In case anyone else is struggling to find the microprojects page,
> here's the link [1]
>
> [1] https://git.github.io/Outreachy-21-Microprojects/
>
>> As I understand it if a submodule contains any untracked files (i.e. a
>> file that has not been added with `git add` and is not ignored by any
>> .gitignore or .git/info/exclude entries) then running `git diff` in the
>> superproject will report that the submodule is dirty - there will be a
>> line something like "+Subproject commit abcdef-dirty". However if we run
>> `git describe --dirty` in the submodule directory then it will not
>> append "-dirty" to it's output unless there are changes to tracked files.
>
> On running `git diff HEAD --ignore-submodules=untracked` the submodule
> wasn't reported as dirty.
That's great
> I guess this is what we are expecting. So should I make it the default
> behavior for diff?
I think that is a good route forward, we probably want to change the
default for `diff-index` and `diff-files` as well
>
> A fix for making this as the default behaviour can be:
>
> --- a/diff.c
> +++ b/diff.c
> @@ -422,6 +422,7 @@ int git_diff_ui_config(const char *var, const char
> *value, void *cb)
> if (git_color_config(var, value, cb) < 0)
> return -1;
>
> + handle_ignore_submodules_arg(&default_diff_options, "untracked");
> return git_diff_basic_config(var, value, cb);
> }
>
> But this would also involve a lot of changes in the way tests are
> written as 12 out of 19 tests in t4027-diff-submodule.sh failed after
> adding this patch. I am working on any other workaround for this. Let
> me know whether I am on right path or not. Also any pointers on how to
> proceed would be helpful. Thanks!
We'd expect some tests to fail but only the ones that are testing if
untracked files cause the submodule to be considered dirty.
git_diff_ui_config() is a callback that is invoked once per config key
in the config files so I don't think it is a good place to make the
change as it is inefficient and overrides the users'
`diff.ignoreSubmodules` setting . It also only applies to `diff` and not
`diff-index` or `diff-files`. I think it would be better to set the
default in diff_setup() though we need to be careful not to override
`diff.ignoreSubmodules` setting so we might need to add a global flag to
remember if the user has set `diff.ignoreSubmodules` in their config
Best Wishes
Phillip
>
next prev parent reply other threads:[~2020-10-12 10:18 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 [this message]
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
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb1d6d2a-868f-7d1a-e004-30efc1950d9a@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).