development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dg/submodule-in-dismembered-working-tree'

Browse source 
In a superproject that has repository outside of its working tree,
"git submodule add" failed to clone a new submodule, as GIT_DIR and
GIT_WORK_TREE environment variables necessary to work in such a
superproject interfered with access to the submodule repository.

* dg/submodule-in-dismembered-working-tree:
  git-submodule: work with GIT_DIR/GIT_WORK_TREE
This commit is contained in:
Junio C Hamano 2012-07-27 21:13:46 -07:00
parent 5000caa306 be8779f7ac
commit a64fe6c1d5
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
git-submodule.sh
View file

@ -181,8 +181,11 @@ module_clone()
rm -f "$gitdir/index"
else
mkdir -p "$gitdir_base"
git clone $quiet -n ${reference:+"$reference"} \
--separate-git-dir "$gitdir" "$url" "$sm_path" ||
(
clear_local_git_env
git clone $quiet -n ${reference:+"$reference"} \
--separate-git-dir "$gitdir" "$url" "$sm_path"
) ||
die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
fi

61
t/t7409-submodule-detached-worktree.sh Normal file
View file

@ -0,0 +1,61 @@
#!/bin/sh
#
# Copyright (c) 2012 Daniel Graña
#
test_description='Test submodules on detached working tree
This test verifies that "git submodule" initialization, update and addition works
on detahced working trees
'
TEST_NO_CREATE_REPO=1
. ./test-lib.sh
test_expect_success 'submodule on detached working tree' '
git init --bare remote &&
test_create_repo bundle1 &&
(cd bundle1 && test_commit "shoot") &&
mkdir home &&
(
cd home &&
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
git clone --bare ../remote .dotfiles &&
git submodule add ../bundle1 .vim/bundle/sogood &&
test_commit "sogood" &&
git push origin master
) &&
mkdir home2 &&
(
cd home2 &&
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
git clone --bare ../remote .dotfiles &&
git submodule update --init
)
'
test_expect_success 'submodule on detached working pointed by core.worktree' '
mkdir home3 &&
(
cd home3 &&
export GIT_DIR="$(pwd)/.dotfiles" &&
git clone --bare ../remote "$GIT_DIR" &&
git config core.bare false &&
git config core.worktree .. &&
git submodule add ../bundle1 .vim/bundle/dupe &&
test_commit "dupe" &&
git push origin master
) &&
(
cd home &&
export GIT_DIR="$(pwd)/.dotfiles" &&
git config core.bare false &&
git config core.worktree .. &&
git pull &&
git submodule update &&
git submodule status &&
test -d .vim/bundle/dupe
)
'
test_done