From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 18 Apr 2005 01:39:14 +0000 (-0700)
Subject: Ignore any unmerged entries for "checkout-cache -a".
X-Git-Tag: v0.99~840
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6;p=git.git

Ignore any unmerged entries for "checkout-cache -a".

They don't "exist" yet, and you need to merge them first.
---

diff --git a/checkout-cache.c b/checkout-cache.c
index 1c257666..5cd473ca 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -141,6 +141,8 @@ static int checkout_all(void)
 
 	for (i = 0; i < active_nr ; i++) {
 		struct cache_entry *ce = active_cache[i];
+		if (ce_stage(ce))
+			continue;
 		if (checkout_entry(ce) < 0)
 			return -1;
 	}