Re: regression in git-gui since 2c5c66b... Merge branch 'jp/get-ref-dir-unsorted

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Oct 17, 2011, 03:40 UTC
Message-ID: <4E9BA39B.709@alum.mit.edu>
In-Reply-To: <4E9B8719.1090203@gmail.com>

On 10/17/2011 03:38 AM, Mark Levedahl wrote:

Show 29 quoted lines

> On 10/16/2011 08:35 PM, Junio C Hamano wrote:
>> Mark Levedahl<mlevedahl@gmail.com>  writes:
>>> I have a project organized as a number of nested git modules (not
>>> using git-submodule), and frequently use git-new-workdir to create the
>>> nested modules.
>>>
>>> Since the above merge-commit, git-gui is confused by this arrangement
>>> and reports every file in every nested module as being an untracked
>>> file in the top-level (super) project.
> [...]
> 
> The following shows the problem for me:
> 
> #!/bin/bash
> mkdir super sub
> cd sub
> git init
> touch a
> git add a
> git commit -m 'file' a
> git pack-refs --all
> cd ../super
> git init
> git new-workdir ../sub sub
> git-gui
> 
> 
> git-gui shows "sub/a" in the list of Unstaged Changes. Note that the
> "git pack-refs" call is needed to get the failure.

Please bear with me because I don't use git-gui so I don't really know what to expect.

When I check out 2c5c66b and run the above script (actually, the script listed below) what I see in git-gui is:

* In the "Unstaged Changes" window, "sub" is listed (not "sub/a").

* When I click on "sub", then in the "Untracked, not staged" window,
"Git Repository (subproject)" appears.

I see the exact same thing when I run the same test script on the version before merge 2c5c66b.

What do you see?

What do you expect to see?

What versions of git, exactly, are you testing (what version do you consider "good"; presumably it is version 2c5c66b that you consider "bad")?

Are you certain that you are using the same git version for all commands ("git", "git-gui", and "git-new-workdir")? Please especially note that git-new-workdir is not part of a default git install, and therefore it would be easy to accidentally use a different version of this script than of the other commands.

Michael

#!/bin/bash

SRC=$(cd $(dirname $0); pwd) GIT=$SRC/git GIT_NEW_WORKDIR=$SRC/contrib/workdir/git-new-workdir GITGUI=$SRC/git-gui/git-gui

rm -rf super sub mkdir super sub cd sub $GIT init touch a $GIT add a $GIT commit -m 'file' a $GIT pack-refs --all cd ../super $GIT init $GIT_NEW_WORKDIR ../sub sub $GITGUI &

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/