diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-04 02:18:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-04 02:18:05 (GMT) |
| commit | fb8880dea3111deb4b1134471aa36f99285d86dc (patch) | |
| tree | 0880d5a203102314cb47e3b0e809e97e34b2c867 /t | |
| parent | 5af77d13529a332bef99d22d0d983d5378edf534 (diff) | |
| parent | 1733ed3d70f0a051b286eea9f7cac78977b40a0d (diff) | |
| download | git-fb8880dea3111deb4b1134471aa36f99285d86dc.zip git-fb8880dea3111deb4b1134471aa36f99285d86dc.tar.gz git-fb8880dea3111deb4b1134471aa36f99285d86dc.tar.bz2 | |
Merge branch 'ee/clean-test-fixes' into maint
* ee/clean-test-fixes:
t7300: fix broken && chains
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7300-clean.sh | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 99be5d9..634808a 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -432,9 +432,7 @@ test_expect_success 'nested git work tree' ' ( cd foo && git init && - >hello.world - git add . && - git commit -a -m nested + test_commit nested hello.world ) && ( cd bar && @@ -443,9 +441,7 @@ test_expect_success 'nested git work tree' ' ( cd baz/boo && git init && - >deeper.world - git add . && - git commit -a -m deeply.nested + test_commit deeply.nested deeper.world ) && git clean -f -d && test -f foo/.git/index && @@ -461,9 +457,7 @@ test_expect_success 'force removal of nested git work tree' ' ( cd foo && git init && - >hello.world - git add . && - git commit -a -m nested + test_commit nested hello.world ) && ( cd bar && @@ -472,9 +466,7 @@ test_expect_success 'force removal of nested git work tree' ' ( cd baz/boo && git init && - >deeper.world - git add . && - git commit -a -m deeply.nested + test_commit deeply.nested deeper.world ) && git clean -f -f -d && ! test -d foo && |