git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] refresh-index: fix bitmask assignment
Date: Sun, 20 Jul 2008 00:28:16 -0700	[thread overview]
Message-ID: <7v3am5f20f.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vk5fhf35p.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 20 Jul 2008 00:03:30 -0700")

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.

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

  reply	other threads:[~2008-07-20  7:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-20  6:31 [PATCH] refresh-index: fix bitmask assignment Junio C Hamano
2008-07-20  7:03 ` Junio C Hamano
2008-07-20  7:28   ` Junio C Hamano [this message]
2008-07-20  7:48     ` [RFC] "needs update" considered harmful Junio C Hamano
2008-07-21 18:17       ` Jay Soffian
2008-07-20  7:48 ` [RFC variant 1 of 2] " Junio C Hamano
2008-07-20  7:48 ` [RFC variant 2 " Junio C Hamano
2008-07-20 11:29   ` Petr Baudis
2008-07-20 12:41     ` Johannes Schindelin
2008-07-20 19:29       ` Junio C Hamano
2008-07-21 17:27         ` Jay Soffian
2008-07-20 14:03     ` André Goddard Rosa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v3am5f20f.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).