Re: [PATCH] refresh-index: fix bitmask assignment
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] refresh-index: fix bitmask assignment · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] refresh-index: fix bitmask assignment · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] 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)' '