Ignore any unmerged entries for "checkout-cache -a".
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 01:39:14 +0000 (18:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 01:39:14 +0000 (18:39 -0700)
They don't "exist" yet, and you need to merge them first.

checkout-cache.c

index 1c25766..5cd473c 100644 (file)
@@ -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;
        }