diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-02 19:50:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-02 19:50:16 (GMT) |
| commit | 83d9092f95cefa3f72ba772b8405b116b622553b (patch) | |
| tree | caffac42bc4d9f082a7005456a0fc7b000c1293b /t | |
| parent | 699a0f3748474fce7b688212c3f9ab25d7b750f5 (diff) | |
| parent | 1733ed3d70f0a051b286eea9f7cac78977b40a0d (diff) | |
| download | git-83d9092f95cefa3f72ba772b8405b116b622553b.zip git-83d9092f95cefa3f72ba772b8405b116b622553b.tar.gz git-83d9092f95cefa3f72ba772b8405b116b622553b.tar.bz2 | |
Merge branch 'ee/clean-test-fixes'
* 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 27557d6..86ceb38 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 && @@ -601,9 +597,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 && @@ -612,9 +606,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 && |