read-tree --debug-unpack

diff --git a/unpack-trees.h b/unpack-trees.h
index d19df44f4070ca1bda29382e56fbced53aacd994..701dca59a8e828cae78c394783ff8d6f8404a5f1 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -28,9 +28,10 @@ struct unpack_trees_options {
                     skip_unmerged,
                     initial_checkout,
                     diff_index_cached,
+                    debug_unpack,
                     gently;
        const char *prefix;
-       int pos;
+       int cache_bottom;
        struct dir_struct *dir;
        merge_fn_t fn;
        struct unpack_trees_error_msgs msgs;