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

Merge branch 'ab/submodule-add-f'

Browse Source 
* ab/submodule-add-f:
  git submodule: add submodules with git add -f <path>
This commit is contained in:
Junio C Hamano
2010-07-15 12:06:25 -07:00
parent aa57328d60 31991b0260
commit 849865733f
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,8 @@ test_expect_success 'setup - hide init subdirectory' '
'
test_expect_success 'setup - repository to add submodules to' '
git init addtest
git init addtest &&
git init addtest-ignore
'
# The 'submodule add' tests need some repository to add as a submodule.
@ -85,6 +86,27 @@ test_expect_success 'submodule add' '
test_cmp empty untracked
'
test_expect_success 'submodule add to .gitignored path' '
echo "refs/heads/master" >expect &&
>empty &&
(
cd addtest-ignore &&
# Does not use test_commit due to the ignore
echo "*" > .gitignore &&
git add --force .gitignore &&
git commit -m"Ignore everything" &&
git submodule add "$submodurl" submod &&
git submodule init
) &&
rm -f heads head untracked &&
inspect addtest/submod ../.. &&
test_cmp expect heads &&
test_cmp expect head &&
test_cmp empty untracked
'
test_expect_success 'submodule add --branch' '
echo "refs/heads/initial" >expect-head &&
cat <<-\EOF >expect-heads &&