| commit | d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Sun Apr 17 18:39:14 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Sun Apr 17 18:39:14 2005 -0700 |
| tree | 594cd3385658b717a95af8827228d51a37d6b813 | |
| parent | 5e5128ed1cf4223fd32a36f858263d361ade5310 [diff] [blame] |
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 1c25766..5cd473c 100644 --- a/checkout-cache.c +++ b/checkout-cache.c
@@ -141,6 +141,8 @@ 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; }