(this might be wrong, not sure if this is the right place)
Signed-off-by: Robin Ruede <[email protected]>
---
cache-tree.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cache-tree.c b/cache-tree.c
index f28b1f4..ab01ae5 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -354,7 +354,8 @@ static int update_one(struct cache_tree *it,
entlen = pathlen - baselen;
i++;
}
- if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))
{
+ if (!ce_skip_worktree(ce) && mode != S_IFGITLINK
+ && !missing_ok && !has_sha1_file(sha1)) {
strbuf_release(&buffer);
if (expected_missing)
return -1;
--
2.9.1.283.g3ca5b4c.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
