X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1001-read-tree-m-2way.sh;h=93ca84f9e6d3dfd859d8bd4941f4d2c5a354ab6c;hb=633142d86874ee8ce79a23ee4346f32e6271faad;hp=0c562bb820cb747a8f0d0df1eabb39da0b9eea21;hpb=c01a29c74ff991faf3012882fbf676b182b8893f;p=git.git diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 0c562bb82..93ca84f9e 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'