Merge branch 'dg/subtree-rebase-test' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 443ff9196d16a9b6fc2d1d8b22393b1533faeb8f..163dbcabf3ba25a6e0e7f387624cee9a2edbb149 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -386,7 +386,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
         */
        if (all || (also && pathspec.nr)) {
                hold_locked_index(&index_lock, 1);
-               add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
+               add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0);
                refresh_cache_or_die(refresh_flags);
                update_main_cache_tree(WRITE_TREE_SILENT);
                if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))