Re: [PATCH] Solve git-submodule issues with detached work trees
- From
Daniel Graña <dangra@gmail.com>
- Date
- Jul 23, 2012, 18:22 UTC
- Message-ID
- <CAHCkQtOCrCaF01fu-LS5jaTbiD7mxmWu0Mi5Dh1YCvcjdUkqLg@mail.gmail.com>
- In-Reply-To
- <500D8C30.9010807@web.de>
On Mon, Jul 23, 2012 at 2:38 PM, Jens Lehmann <Jens.Lehmann@web.de> wrote:
Show 35 quoted lines
> Am 23.07.2012 07:09, schrieb Junio C Hamano: >> Daniel Graña <dangra@gmail.com> writes: >> >>> A common way to track dotfiles with git is using GIT_DIR and >>> GIT_WORK_TREE to move repository out of ~/.git with something like: >>> >>> git init --bare ~/.dotfiles >>> alias dotfiles="GIT_DIR=~/.dotfiles GIT_WORK_TREE=~ git" >>> >>> dotfiles add ~/.bashrc >>> dotfiles commit -a -m "add my bashrc" >>> ... >>> >>> but git-submodule complains when trying to add submodules: >>> >>> dotfiles submodule add http://path.to/submodule >>> fatal: working tree '/home/user' already exists. >>> >>> git --git-dir ~/.dotfiles submodule add http://path.to/submodule >>> fatal: /usr/lib/git-core/git-submodule cannot be used without a >>> working tree. >>> >>> Signed-off-by: Daniel Graña <dangra@gmail.com> >>> --- >> >> I think this is in line with what we discussed earlier on list when >> the interaction between GIT_DIR/GIT_WORK_TREE and submodules came up >> the last time. Jens? > > Yes, I think this is the only way submodules in current git can > be used with the GIT_DIR and GIT_WORK_TREE environment variables: > set them when adding or initializing the submodule and always use > the same settings when accessing them later. Daniel's dotfile > alias achieves exactly that, so his fix looks good. But I agree > the tests should be improved as you already pointed out.
Hi Jens, Junio.
Thanks for reviewing the patch, glad to hear this is acceptable way to fix my itch.
I will work soon on getting the test cases improved and the patch submitted without line wrapping.
thanks again, Daniel.