worktree: rename is_worktree_locked to worktree_lock_reason

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 40844870cfb158b014ee5ea10517c27349e09133..8e1db55e136c368f06c4029b4cd2c888400bb81a 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -792,7 +792,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
                         path, NULL);
 
        git_config(git_diff_basic_config, NULL);
-       init_revisions(&rev, prefix);
+       repo_init_revisions(the_repository, &rev, prefix);
        rev.abbrev = 0;
        diff_files_args.argc = setup_revisions(diff_files_args.argc,
                                               diff_files_args.argv,
@@ -1233,6 +1233,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
        if (gitdir && *gitdir)
                argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
 
+       argv_array_push(&cp.args, "--");
        argv_array_push(&cp.args, url);
        argv_array_push(&cp.args, path);
 
@@ -1456,7 +1457,6 @@ static void determine_submodule_update_strategy(struct repository *r,
        key = xstrfmt("submodule.%s.update", sub->name);
 
        if (update) {
-               trace_printf("parsing update");
                if (parse_submodule_update_strategy(update, out) < 0)
                        die(_("Invalid update mode '%s' for submodule path '%s'"),
                                update, path);
@@ -1465,7 +1465,6 @@ static void determine_submodule_update_strategy(struct repository *r,
                        die(_("Invalid update mode '%s' configured for submodule path '%s'"),
                                val, path);
        } else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
-               trace_printf("loaded thing");
                out->type = sub->update_strategy.type;
                out->command = sub->update_strategy.command;
        } else