Re: FIX/COMMENT: git remote manual page

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Dec 25, 2010, 10:48 UTC
Message-ID: <AANLkTim_pHYEZ+7-Rm5N4Ycw2MTHD8AhvZrZqNhttkck@mail.gmail.com>
In-Reply-To: <20101222021546.4b24c4e9@eana.kheb.homelinux.org>

On Wed, Dec 22, 2010 at 8:15 AM, Michel Briand <michelbriand@free.fr> wrote:

Show 19 quoted lines

> Hello,
>
> I tried the example given at the bottom if the manual page of git
> remote.
>
> ·   Imitate git clone but track only selected branches
>
> $ mkdir project.git
> $ cd project.git
> $ git init
> $ git remote add -f -t master -m master origin git://example.com/git.git/
> $ git merge origin
>
> It works like it is written.
>
> But it seems this does not work with my special setup:
> - I use GIT_DIR and GIT_WORK_TREE to specify another location for my
>  repository, and to work from another directory,
> - I name my remote with a custom name (not origin).

So you set GIT_DIR and GIT_WORK_TREE before running "git remote add"?

> It fails at the last command :
>
>    fatal: <my name> - not something we can merge

It fails to see "<my name>" points to a commit. Maybe it fails to read remote information from config..

Show 11 quoted lines

> But if I try the command :
>
>    git merge <my name>/master
>
> the error message is different :
>
>    fatal: This operation must be run in a work tree
>    fatal: read-tree failed
>
> I cd to the work tree and issue the same last command.
> Then it works.

What git version are use using? I did

GIT_DIR=git/.git GIT_WORK_TREE=git git/git merge origin # or a specific branch

and it worked fine here (recent master). That message means work-tree settings are not propagated to git-read-tree (run by git-merge).

-- 
Duy