unpack-trees: move all skip-worktree checks back to unpack_trees()

diff --git a/cache.h b/cache.h
index f9545a14c05760e2cb80f06fc6a4c7b7d92cc625..cb6931836a6485ae86e8af58a71570ee44e47c0f 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -181,6 +181,7 @@ struct cache_entry {
 #define CE_CONFLICTED        (1 << 23)
 
 #define CE_UNPACKED          (1 << 24)
+#define CE_NEW_SKIP_WORKTREE (1 << 25)
 
 /*
  * Extended on-disk flags