@@ -513,12 +513,24 @@ int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
return 0;
}
- if (topath) {
+ if (topath || state->clone) {
if (S_ISREG(ce->ce_mode) && !ca) {
convert_attrs(state->istate, &ca_buf, ce->name);
ca = &ca_buf;
}
- return write_entry(ce, topath, ca, state, 1);
+ if (topath)
+ return write_entry(ce, topath, ca, state, 1);
+ /*
+ * Since we are cloning, there should be no previous files in
+ * the working tree. So we can skip calling remove_non_dirs()
+ * and check_path(). (parallel-checkout.c will take care of path
+ * collision.)
+ */
+ if (!enqueue_checkout(ce, ca)) {
+ if (nr_checkouts)
+ (*nr_checkouts)++;
+ return 0;
+ }
}
/*
If the current checkout process is part of a clone, we can skip some steps that check paths in the working tree, as we know it was previously empty. More specifically, we can enqueue the entry for parallel checkout before calling check_path() to see if the path was already present and up-to-date. We can also skip calling remove_non_dirs(). Note: this optimization is only possible because the parallel checkout machinery will detect path collisions, and call checkout_entry_ca() again for them, going through the check_path() logic. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- entry.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)