mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fg/submodule-git-file-git-dir'

Browse Source 
* fg/submodule-git-file-git-dir:
  Move git-dir for submodules
  rev-parse: add option --resolve-git-dir <path>

Conflicts:
	cache.h
	git-submodule.sh
This commit is contained in:
Junio C Hamano
2011-10-10 15:56:16 -07:00
parent 27c0f76884 501770e1bb
commit efc5fb6a77
10 changed files with 244 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7400-submodule-basic.sh
View File

@ -362,10 +362,10 @@ test_expect_success 'update --init' '
git submodule update init > update.out &&
cat update.out &&
test_i18ngrep "not initialized" update.out &&
! test -d init/.git &&
test_must_fail git rev-parse --resolve-git-dir init/.git &&
git submodule update --init init &&
test -d init/.git
git rev-parse --resolve-git-dir init/.git
'
test_expect_success 'do not add files from a submodule' '