diff --git a/unpack-trees.h b/unpack-trees.h
index 95ff36c824a14a24234459ad552306fb1b5dabf1..ef70eab39025fcdaccda059692ae447a13fa0aeb 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
skip_unmerged,
initial_checkout,
diff_index_cached,
+ debug_unpack,
skip_sparse_checkout,
gently;
const char *prefix;
- int pos;
+ int cache_bottom;
struct dir_struct *dir;
merge_fn_t fn;
struct unpack_trees_error_msgs msgs;