aboutsummaryrefslogtreecommitdiff
path: root/t/t1011-read-tree-sparse-checkout.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 15:51:49 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 15:51:49 -0800
commitb3ff808b714fd8fc5e4d2770720398e5dc7d27f9 (patch)
tree3db88ef171d6fcae53d0edf714fb280134be3baf /t/t1011-read-tree-sparse-checkout.sh
parentc6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c (diff)
parent33fc521193746a0961c270997dbb881b520ad793 (diff)
downloadgit-b3ff808b714fd8fc5e4d2770720398e5dc7d27f9.tar.gz
git-b3ff808b714fd8fc5e4d2770720398e5dc7d27f9.tar.xz
Merge branch 'en/and-cascade-tests'
* en/and-cascade-tests: (25 commits) t4124 (apply --whitespace): use test_might_fail t3404: do not use 'describe' to implement test_cmp_rev t3404 (rebase -i): introduce helper to check position of HEAD t3404 (rebase -i): move comment to description t3404 (rebase -i): unroll test_commit loops t3301 (notes): use test_expect_code for clarity t1400 (update-ref): use test_must_fail t1502 (rev-parse --parseopt): test exit code from "-h" t6022 (renaming merge): chain test commands with && test-lib: introduce test_line_count to measure files tests: add missing &&, batch 2 tests: add missing && Introduce sane_unset and use it to ensure proper && chaining t7800 (difftool): add missing && t7601 (merge-pull-config): add missing && t7001 (mv): add missing && t6016 (rev-list-graph-simplify-history): add missing && t5602 (clone-remote-exec): add missing && t4026 (color): remove unneeded and unchained command t4019 (diff-wserror): add lots of missing && ... Conflicts: t/t7006-pager.sh
Diffstat (limited to 't/t1011-read-tree-sparse-checkout.sh')
-rwxr-xr-xt/t1011-read-tree-sparse-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 8008fa2d8..0ef11bccb 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -49,7 +49,7 @@ test_expect_success 'read-tree without .git/info/sparse-checkout' '
'
test_expect_success 'read-tree with .git/info/sparse-checkout but disabled' '
- echo >.git/info/sparse-checkout
+ echo >.git/info/sparse-checkout &&
git read-tree -m -u HEAD &&
git ls-files -t >result &&
test_cmp expected.swt result &&