Merge branch 'jc/unpack-trees-reword'

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 83da7ca9ffae6a7fae94fcd012078bdec36ed72e..68fffd28cb636d115ed4491b55ce3b87d0b97109 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -284,7 +284,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                         * entries in the index.
                         */
 
-                       add_files_to_cache(0, NULL, NULL);
+                       add_files_to_cache(NULL, NULL, 0);
                        work = write_tree_from_memory();
 
                        ret = reset_to_new(new->commit->tree, opts->quiet);