[PATCH 2/2] checkout: fix attribute handling in checkout all
From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:43:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
We need to check out .gitattributes files first to have them in place when we check out the remaining files. This is needed to get the right attributes during checkout, for example having the right crlf conversion on the first checkout if crlf is controlled by a .gitattribute file. This works only together with the commit 'attr: fix attribute handling if .gitattributes is involved' which ensures that .gitattributes files do not trigger the attribute machinery too early. Signed-off-by: Steffen Prohaska <redacted> --- builtin-checkout-index.c | 47 ++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 75377b9..5e87a39 100644
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c@@ -125,27 +125,38 @@ static int checkout_file(const char *name, int prefix_length) static void checkout_all(const char *prefix, int prefix_length) { - int i, errs = 0; + int i, pass, errs = 0; struct cache_entry* last_ce = NULL; - for (i = 0; i < active_nr ; i++) { - struct cache_entry *ce = active_cache[i]; - if (ce_stage(ce) != checkout_stage - && (CHECKOUT_ALL != checkout_stage || !ce_stage(ce))) - continue; - if (prefix && *prefix && - (ce_namelen(ce) <= prefix_length || - memcmp(prefix, ce->name, prefix_length))) - continue; - if (last_ce && to_tempfile) { - if (ce_namelen(last_ce) != ce_namelen(ce) - || memcmp(last_ce->name, ce->name, ce_namelen(ce))) - write_tempfile_record(last_ce->name, prefix_length); + /* pass 0: check out only .gitattribute files + pass 1: check out every file + + This is needed to have all .gitattributes in place before + checking out files, and thus do the right conversion. + */ + for (pass = 0; pass < 2; pass++) { + for (i = 0; i < active_nr ; i++) { + struct cache_entry *ce = active_cache[i]; + if (pass == 0 && strstr (ce->name, GITATTRIBUTES_FILE) == 0) { + continue; + } + if (ce_stage(ce) != checkout_stage + && (CHECKOUT_ALL != checkout_stage || !ce_stage(ce))) + continue; + if (prefix && *prefix && + (ce_namelen(ce) <= prefix_length || + memcmp(prefix, ce->name, prefix_length))) + continue; + if (last_ce && to_tempfile) { + if (ce_namelen(last_ce) != ce_namelen(ce) + || memcmp(last_ce->name, ce->name, ce_namelen(ce))) + write_tempfile_record(last_ce->name, prefix_length); + } + if (checkout_entry(ce, &state, + to_tempfile ? topath[ce_stage(ce)] : NULL) < 0) + errs++; + last_ce = ce; } - if (checkout_entry(ce, &state, - to_tempfile ? topath[ce_stage(ce)] : NULL) < 0) - errs++; - last_ce = ce; } if (last_ce && to_tempfile) write_tempfile_record(last_ce->name, prefix_length);
--
1.5.3.rc4.96.g6ceb