X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unpack-trees.h;h=ef70eab39025fcdaccda059692ae447a13fa0aeb;hb=3fa7c3da379bb47a0e7a52ffc13cb366add880a2;hp=95ff36c824a14a24234459ad552306fb1b5dabf1;hpb=06dbc1ea5768618337bf11e5f64c4f9f14a68008;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 95ff36c82..ef70eab39 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -31,10 +31,11 @@ struct unpack_trees_options {
 		     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;