From: Junio C Hamano Date: Sun, 20 Jul 2008 07:28:16 GMT Subject: Re: [PATCH] refresh-index: fix bitmask assignment Message-ID: <7v3am5f20f.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7vk5fhf35p.fsf@gitster.siamese.dyndns.org> Junio C Hamano writes: > This hopefully protects the previous fix (and other --refresh related > options) from future breakages. > > I'll squash it in to the previous one. Actually, I'll squash this further on top, for a reason that will become clear with the next series... --- t/t2103-update-index-ignore-missing.sh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/t/t2103-update-index-ignore-missing.sh b/t/t2103-update-index-ignore-missing.sh index 332694e..4fbf855 100755 --- a/t/t2103-update-index-ignore-missing.sh +++ b/t/t2103-update-index-ignore-missing.sh @@ -62,10 +62,9 @@ test_expect_success '--unmerged --refresh' ' test_must_fail git update-index --refresh && git update-index --unmerged --refresh && echo 2 >two && + echo "two: needs update" >expect && test_must_fail git update-index --unmerged --refresh >actual && - grep two actual && - ! grep one actual && - ! grep three actual + test_cmp expect actual ' test_expect_success '--ignore-submodules --refresh (1)' '