Re: [PATCH 0/5] Revamping "git status"

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2009, 18:05 UTC
Message-ID: <7v3a869lw1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <200908051940.48110.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> Meh, this stops before the git-status because merge signals a
> conflict.  However, the following really crashes.  Promise.

Thanks.

 wt-status.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/wt-status.c b/wt-status.c
index f73bf47..6370fe2 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -236,7 +236,7 @@ static int unmerged_mask(const char *path)
 
 	mask = 0;
 	pos = -pos-1;
-	while (pos <= active_nr) {
+	while (pos < active_nr) {
 		ce = active_cache[pos++];
 		if (strcmp(ce->name, path))
 			break;