Re: [BUG] Fail to add a module in a subdirectory if module is already cloned
- From
Jens Lehmann <jens.lehmann@web.de>
- Date
- Jan 24, 2012, 21:10 UTC
- Message-ID
- <4F1F1E5F.2030509@web.de>
- In-Reply-To
- <jfmvpp$4v7$1@dough.gmane.org>
Am 24.01.2012 20:11, schrieb Jehan Bing:
Show 35 quoted lines
> I'm getting an error if I try to add a module in a subdirectory and that module is already cloned. > Here are the steps to reproduce (git 1.7.8.3): > > git init module > cd module > echo foo > foo > git add foo > git commit -m "init" > cd .. > git init super > cd super > echo foo > foo > git add foo > git commit -m "init" > git branch b1 > git branch b2 > git checkout b1 > git submodule add ../module lib/module > git commit -m "module" > git checkout b2 > rm -rf lib > git submodule add ../module lib/module > > The last command returns: > fatal: Not a git repository: ../.git/modules/lib/module > Unable to checkout submodule 'lib/module' > > The file lib/modules/.git contains: > gitdir: ../.git/modules/lib/module > (missing an additional "../") > > In branch b1, after adding the module, the file contained the full path: > gitdir: /[...]/super/.git/modules/lib/module > Or contains the correct relative path after checking out b1 later: > gitdir: ../../.git/modules/lib/module
Thanks for your detailed report, I can reproduce that on current master.
The reason for this bug seems to be that in module_clonse() the name is not properly initialized for added submodules (it gets set to the path later), so the correct amount of leading "../"s for the git directory is not computed properly. The attached diff fixes that for me, I will send a patch as soon as I have extended a test case for this breakage.
diff --git a/git-submodule.sh b/git-submodule.sh index 3adab93..9bb2e13 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -131,6 +131,7 @@ module_clone() gitdir= gitdir_base= name=$(module_name "$path" 2>/dev/null) + test -n "$name" || name="$path" base_path=$(dirname "$path") gitdir=$(git rev-parse --git-dir)