From: Jens Lehmann <Jens.Lehmann@web.de>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Andy Parkins <andyparkins@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Don't do status in submodules if status.SubmoduleSummary unset
Date: Thu, 20 May 2010 19:45:28 +0200 [thread overview]
Message-ID: <4BF57538.5040204@web.de> (raw)
In-Reply-To: <AANLkTil1QHA3G2VaITdm7DkDmN1IhZ_u2SWLrelyxkF2@mail.gmail.com>
Am 20.05.2010 16:12, schrieb Alex Riesen:
> Maybe because we do a (kind of) gentle status run on submodules
> whether the status.SubmoduleSummary set or not.
Yup, because checking a submodule for its dirtiness has to be done
no matter if the summary output is also wanted.
> Usually a background
> run of "git status" for every submodules goes unnoticed, just
> sometimes a submodule is a little too big.
>
> I tried this, but feels like a bit of overkill.
This patch seems to disable submodule output completely for the default
case (when status.SubmoduleSummary is false) and breaks 17 test cases.
So no thumbs up from me ;-)
> diff --git a/wt-status.c b/wt-status.c
> index 8ca59a2..d5bcdf9 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -303,7 +303,10 @@ static void
> wt_status_collect_changes_worktree(struct wt_status *s)
> init_revisions(&rev, NULL);
> setup_revisions(0, NULL, &rev, NULL);
> rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
> - DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
> + if (s->submodule_summary)
> + DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
> + else
> + DIFF_OPT_SET(&rev.diffopt, IGNORE_SUBMODULES);
> if (!s->show_untracked_files)
> DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
> rev.diffopt.format_callback = wt_status_collect_changed_cb;
next prev parent reply other threads:[~2010-05-20 17:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-20 14:12 [PATCH] Don't do status in submodules if status.SubmoduleSummary unset Alex Riesen
2010-05-20 17:45 ` Jens Lehmann [this message]
2010-05-20 19:34 ` Alex Riesen
2010-05-20 20:14 ` Jens Lehmann
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=4BF57538.5040204@web.de \
--to=jens.lehmann@web.de \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=raa.lkml@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).