kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ee/clean-test-fixes' into maint 

* ee/clean-test-fixes:
  t7300: fix broken && chains
maint
Junio C Hamano 2015-09-03 19:18:05 -07:00
parent 5af77d1352 1733ed3d70
commit fb8880dea3
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/t7300-clean.sh
View File

@ -432,9 +432,7 @@ test_expect_success 'nested git work tree' '
( (
cd foo && cd foo &&
git init && git init &&
>hello.world test_commit nested hello.world
git add . &&
git commit -a -m nested
) && ) &&
( (
cd bar && cd bar &&
@ -443,9 +441,7 @@ test_expect_success 'nested git work tree' '
( (
cd baz/boo && cd baz/boo &&
git init && git init &&
>deeper.world test_commit deeply.nested deeper.world
git add . &&
git commit -a -m deeply.nested
) && ) &&
git clean -f -d && git clean -f -d &&
test -f foo/.git/index && test -f foo/.git/index &&
@ -461,9 +457,7 @@ test_expect_success 'force removal of nested git work tree' '
( (
cd foo && cd foo &&
git init && git init &&
>hello.world test_commit nested hello.world
git add . &&
git commit -a -m nested
) && ) &&
( (
cd bar && cd bar &&
@ -472,9 +466,7 @@ test_expect_success 'force removal of nested git work tree' '
( (
cd baz/boo && cd baz/boo &&
git init && git init &&
>deeper.world test_commit deeply.nested deeper.world
git add . &&
git commit -a -m deeply.nested
) && ) &&
git clean -f -f -d && git clean -f -f -d &&
! test -d foo && ! test -d foo &&