Re: Re: [msysGit] [PATCH] submodules: ensure clean environment when operating in a submodule

From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Feb 23, 2010, 21:07 UTC
Message-ID: <20100223210751.GA10932@book.hvoigt.net>
In-Reply-To: <alpine.DEB.1.00.1002230103160.3609@intel-tinevez-2-302>

On Tue, Feb 23, 2010 at 01:04:00AM +0100, Johannes Schindelin wrote:

Show 20 quoted lines

> Hi,
> 
> On Mon, 22 Feb 2010, Giuseppe Bilotta wrote:
> 
> > git-submodule takes care of clearing GIT_DIR whenever it operates
> > on a submodule index or configuration, but forgot to unset GIT_WORK_TREE
> > before operating on the submodule worktree, which would lead to failures
> > when GIT_WORK_TREE was set.
> > 
> > This only happened in very unusual contexts such as operating on the
> > main worktree from outside of it, but since "git-gui: set GIT_DIR and
> > GIT_WORK_TREE after setup" (a9fa11fe5bd5978bb) such failures could also
> > be provoked by invoking an external tool such as "git submodule update"
> > from the Git GUI in a standard setup.
> > 
> > Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
> > ---
> 
> Heiko, would you say that this patch is an elegant solution to the problem 
> you reported? If so, would you please pull it to 4msysgit.git's devel?

I would like to leave the patch cooking a little more. For example see the objection of Jens[1]. Just to be sure that we do not pull in other issues with this. Sorry I do not have the time for extensive testing currently. So my suggestion would be to leave msysgit in the current state as I did not discover any downsides with just the revert with my current users tests.

As far as I understand the patch fixes issues when submodules itself contain submodules and it seems that not many users are doing this currently. Once everybody is happy (and tried) the patches I do not have any objections to pushing it into devel.

What do you think?

cheers Heiko

[1] http://groups.google.com/group/msysgit/msg/481e252ba4f49ede