diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:17:17 -0700 |
| commit | 4265ee3e6e391709168cc507c1c9bb705392cdfe (patch) | |
| tree | 4ed873b595f3565911056401ade93eaa45b74b75 /t/t1001-read-tree-m-2way.sh | |
| parent | Merge branch 'jh/clean-exclude' (diff) | |
| parent | Convert "! git" to "test_must_fail git" (diff) | |
| download | tgif-4265ee3e6e391709168cc507c1c9bb705392cdfe.tar.xz | |
Merge branch 'jh/use-test-must-fail'
* jh/use-test-must-fail:
Convert "! git" to "test_must_fail git"
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 0c562bb820..93ca84f9e6 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -359,7 +359,7 @@ test_expect_success \ test_expect_success \ 'a/b (untracked) vs a, plus c/d case test.' \ - '! git read-tree -u -m "$treeH" "$treeM" && + 'test_must_fail git read-tree -u -m "$treeH" "$treeM" && git ls-files --stage && test -f a/b' |