From: Damien Robert <damien.olivier.robert@gmail.com>
To: "Philippe Blain" <levraiphilippeblain@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Spurious GIT_DIR set when in a worktree [was Re: Nested submodule status bug]
Date: Thu, 27 Feb 2020 11:43:30 +0100 [thread overview]
Message-ID: <20200227104330.hp7zf2suquxsf6zw@feanor> (raw)
In-Reply-To: <20200227100557.ydouc4n3jphzbits@feanor>
> Ok, so using GIT_TRACE and GIT_TRACE_STATUS and doing some debugging I
> understand the cause of the bug. When using the alias,
> the GIT_DIR environment is set to the bar module:
> GIT_DIR=/tmp/test/foo/.git/modules/bar
> and is exported.
>
> That's explain why in `baz` the status report the status of the `bar`
> directory.
And looking at setup.c:760 it appears that `set_git_dir` (which set up among
other things the GIT_DIR env) is called because we are in a worktree.
More precisely: we have discovered a git dir (a git file), so we call
setup_discovered_git_dir, which itself calls setup_explicit_git_dir because
we are in a work tree environment. And set_up_explicit_git_dir calls
set_git_dir.
So I don't know what's the proper way to fix this. Keep track when we add
ourselves the GIT_DIR rather than when it is already provided and remove it
before executing a shell alias? Don't run the full configuration setup when
we are executing a shell alias anyway?
I am adding Nguyễn Thái Ngọc Duy to the discussion (I hope this is the
proper etiquette).
Best regards,
Damien
next prev parent reply other threads:[~2020-02-27 10:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 22:42 Nested submodule checkout Damien Robert
2020-02-17 4:51 ` Philippe Blain
2020-02-18 17:08 ` Damien Robert
2020-02-19 4:19 ` Philippe Blain
2020-02-26 17:23 ` Nested submodule status bug Damien Robert
2020-02-27 10:05 ` Damien Robert
2020-02-27 10:43 ` Damien Robert [this message]
2020-02-27 15:50 ` GIT_DIR in aliases [Re: Spurious GIT_DIR set when in a worktree [was Re: Nested submodule status bug] Damien Robert
2020-02-28 19:02 ` Jeff King
2020-02-28 20:22 ` Junio C Hamano
2020-03-03 22:44 ` Damien Robert
2020-02-29 1:42 ` Philippe Blain
2020-03-03 21:56 ` Damien Robert
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=20200227104330.hp7zf2suquxsf6zw@feanor \
--to=damien.olivier.robert@gmail.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=pclouds@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).