Re: Merge git-gui into 1.5.0 ?

Jakub Narebski [off-list ref] wrote:

quoted

On Mon, 12 Feb 2007, Shawn O. Pearce wrote:

quoted

Johannes Schindelin [off-list ref] wrote:

quoted

On Mon, 12 Feb 2007, Junio C Hamano wrote:

quoted

$ git read-tree --prefix=git-gui/ git-gui/master
$ git checkout git-gui

Didn't you mean "git checkout master" here?

I don't think so.  At this point the subdirectory git-gui is known
in the index, so Junio is trying to get checkout-index to process
those paths and create it in the working directory.

So it is "git checkout -- git-gui" then?

Yes.  But this trick only works once.  After that you cannot use
`read-tree --prefix` to load the index with the git-gui/master
branch, as there already is stuff under git-gui.  Instead you need
to whack the directory's files from the index, then reload it.

Or abuse mktree, as I did in the script I posted.

-- 
Shawn.