From: Jonathan Nieder Date: Sun, 08 Aug 2010 22:39:24 GMT Subject: Re: [PATCH 2/5] unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set Message-ID: <20100808223924.GA7946@burratino> In-Reply-To: <1280556869-707-3-git-send-email-pclouds@gmail.com> Hi Duy, Nguyễn Thái Ngọc Duy wrote: > +++ b/t/t1011-read-tree-sparse-checkout.sh > @@ -155,4 +155,16 @@ test_expect_success 'read-tree adds to worktree, dirty case' ' > grep -q dirty sub/added > ' > > +test_expect_success 'index removal and worktree narrowing at the same time' ' > + >empty && > + echo init.t >.git/info/sparse-checkout && > + echo sub/added >>.git/info/sparse-checkout && > + git checkout -f top && > + echo init.t >.git/info/sparse-checkout && > + git checkout removed && > + git ls-files sub/added >result > + test ! -f sub/added && Missing “&&”. Sorry to miss this before. Patch for squashing follows. -- 8< -- Subject: t1011 (sparse checkout): fix &&-chaining Make sure errors from “git checkout” are detected. Signed-off-by: Jonathan Nieder --- t/t1011-read-tree-sparse-checkout.sh | 2 +- 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 04d4450..9a07de1 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -162,7 +162,7 @@ test_expect_success 'index removal and worktree narrowing at the same time' ' git checkout -f top && echo init.t >.git/info/sparse-checkout && git checkout removed && - git ls-files sub/added >result + git ls-files sub/added >result && test ! -f sub/added && test_cmp empty result ' -- 1.7.2.1.544.ga752d.dirty