From d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 17 Apr 2005 18:39:14 -0700
Subject: [PATCH] Ignore any unmerged entries for "checkout-cache -a".

They don't "exist" yet, and you need to merge them first.
---
 checkout-cache.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/checkout-cache.c b/checkout-cache.c
index 1c257666e6..5cd473ca1c 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;
 	}
-- 
2.11.4.GIT