From: Junio C Hamano <gitster@pobox.com>
To: Goss Geppert <gg.oss.dev@gmail.com>
Cc: git@vger.kernel.org, christian w <usebees@gmail.com>,
Elijah Newren <newren@gmail.com>,
Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH v2 2/2] dir: minor refactoring / clean-up
Date: Wed, 11 May 2022 09:51:20 -0700 [thread overview]
Message-ID: <xmqqv8ucko6v.fsf@gitster.g> (raw)
In-Reply-To: <20220510171527.25778-3-ggossdev@gmail.com> (Goss Geppert's message of "Tue, 10 May 2022 17:15:27 +0000")
Goss Geppert <gg.oss.dev@gmail.com> writes:
> Improve readability.
It reads somewhat a subjective opinion, without explaining how/why
the change makes it more readable. Perhaps
Narrow the scope of the nested_repo variable to the block
that uses it.
or something?
I was hoping that we can/should apply these two patches near where
the breakage happened, but unfortunately this part has been updated
a bit since then, so merging upwards would involve a bit of conflict
resolution. We should be able to manage.
Thanks.
> Signed-off-by: Goss Geppert <ggossdev@gmail.com>
> ---
> dir.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/dir.c b/dir.c
> index a1886e61a3..329db72999 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1861,7 +1861,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
> */
> enum path_treatment state;
> int matches_how = 0;
> - int nested_repo = 0, check_only, stop_early;
> + int check_only, stop_early;
> int old_ignored_nr, old_untracked_nr;
> /* The "len-1" is to strip the final '/' */
> enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
> @@ -1901,6 +1901,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
> * configured by the user; see t2205 testcases 1a-1d for examples
> * where this matters
> */
> + int nested_repo;
> struct strbuf sb = STRBUF_INIT;
> strbuf_addstr(&sb, dirname);
> nested_repo = is_nonbare_repository_dir(&sb);
> @@ -1919,12 +1920,13 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
> free(real_dirname);
> }
> strbuf_release(&sb);
> - }
> - if (nested_repo) {
> - if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
> - (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
> - return path_none;
> - return excluded ? path_excluded : path_untracked;
> +
> + if (nested_repo) {
> + if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
> + (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
> + return path_none;
> + return excluded ? path_excluded : path_untracked;
> + }
> }
>
> if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
next prev parent reply other threads:[~2022-05-11 16:52 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 20:32 [RFC PATCH 0/1] dir: consider worktree config in path recursion Goss Geppert
2022-05-05 20:32 ` [RFC PATCH 1/1] " Goss Geppert
2022-05-07 3:26 ` Elijah Newren
2022-05-07 17:59 ` oss dev
2022-05-06 17:02 ` [RFC PATCH 0/1] " Junio C Hamano
2022-05-06 20:00 ` oss dev
2022-05-10 17:15 ` [PATCH v2 0/2] " Goss Geppert
2022-05-10 17:15 ` [PATCH v2 1/2] " Goss Geppert
2022-05-11 16:37 ` Junio C Hamano
2022-05-20 19:45 ` oss dev
2022-05-24 14:29 ` Elijah Newren
2022-05-24 19:45 ` Junio C Hamano
2022-05-25 3:46 ` Elijah Newren
2022-05-11 23:07 ` Junio C Hamano
2022-05-20 20:01 ` oss dev
2022-05-23 19:23 ` Derrick Stolee
2022-05-30 18:48 ` oss dev
2022-05-10 17:15 ` [PATCH v2 2/2] dir: minor refactoring / clean-up Goss Geppert
2022-05-11 16:51 ` Junio C Hamano [this message]
2022-05-20 20:03 ` oss dev
2022-05-20 19:28 ` [PATCH v3 0/3] dir: traverse into repository Goss Geppert
2022-05-20 19:28 ` [PATCH v3 1/3] " Goss Geppert
2022-05-20 19:28 ` [PATCH v3 2/3] dir: cache git_dir's realpath Goss Geppert
2022-05-24 14:32 ` Elijah Newren
2022-05-20 19:28 ` [PATCH v3 3/3] dir: minor refactoring / clean-up Goss Geppert
2022-06-16 23:19 ` [PATCH v4 0/2] dir: traverse into repository Goss Geppert
2022-06-22 4:57 ` Elijah Newren
[not found] ` <20220616231956.154-1-gg.oss@outlook.com>
2022-06-16 23:19 ` [PATCH v4 1/2] " Goss Geppert
2022-06-16 23:44 ` [PATCH v4 0/2] dir: traverse into repository (resending) Goss Geppert
[not found] ` <20220616234433.225-1-gg.oss@outlook.com>
2022-06-16 23:44 ` [PATCH v4 1/2] dir: traverse into repository Goss Geppert
2022-06-16 23:44 ` [PATCH v4 2/2] dir: minor refactoring / clean-up Goss Geppert
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=xmqqv8ucko6v.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=derrickstolee@github.com \
--cc=gg.oss.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=usebees@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).