Re: [PATCH] refresh-index: fix bitmask assignment

From

Junio C Hamano <gitster@pobox.com>

Date

Jul 20, 2008, 07:28 UTC

Message-ID

<7v3am5f20f.fsf@gitster.siamese.dyndns.org>

In-Reply-To

<7vk5fhf35p.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> This hopefully protects the previous fix (and other --refresh related
> options) from future  breakages.
>
> I'll squash it in to the previous one.

---
 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)' '