mirror of
https://github.com/git/git.git
synced 2024-09-23 04:52:59 +02:00
Ignore any unmerged entries for "checkout-cache -a".
They don't "exist" yet, and you need to merge them first.
This commit is contained in:
parent
5e5128ed1c
commit
d9f98eebcd
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user