checkout: make "opts" in cmd_checkout() a pointer

"opts" will soon be moved out of cmd_checkout(). To keep changes in
that patch smaller, convert "opts" to a pointer and keep the real
thing behind "real_opts".

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 897eefe16decfeb728b65bfd56747ebed2a60c20..b6de8401feba8d7543ca9a4c1d6234c55df77a0f 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1341,82 +1341,83 @@ static int checkout_branch(struct checkout_opts *opts,
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
 {

-       struct checkout_opts opts;
+       struct checkout_opts real_opts;
+       struct checkout_opts *opts = &real_opts;

        struct branch_info new_branch_info;
        char *conflict_style = NULL;
        int dwim_new_local_branch, no_dwim_new_local_branch = 0;
        int dwim_remotes_matched = 0;
        struct option options[] = {
        struct branch_info new_branch_info;
        char *conflict_style = NULL;
        int dwim_new_local_branch, no_dwim_new_local_branch = 0;
        int dwim_remotes_matched = 0;
        struct option options[] = {

-               OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
-               OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
+               OPT__QUIET(&opts->quiet, N_("suppress progress reporting")),
+               OPT_STRING('b', NULL, &opts->new_branch, N_("branch"),

                           N_("create and checkout a new branch")),
                           N_("create and checkout a new branch")),

-               OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
+               OPT_STRING('B', NULL, &opts->new_branch_force, N_("branch"),

                           N_("create/reset and checkout a branch")),
                           N_("create/reset and checkout a branch")),

-               OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
-               OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")),
-               OPT_SET_INT('t', "track",  &opts.track, N_("set upstream info for new branch"),
+               OPT_BOOL('l', NULL, &opts->new_branch_log, N_("create reflog for new branch")),
+               OPT_BOOL(0, "detach", &opts->force_detach, N_("detach HEAD at named commit")),
+               OPT_SET_INT('t', "track",  &opts->track, N_("set upstream info for new branch"),

                        BRANCH_TRACK_EXPLICIT),
                        BRANCH_TRACK_EXPLICIT),

-               OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
-               OPT_SET_INT_F('2', "ours", &opts.writeout_stage,
+               OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
+               OPT_SET_INT_F('2', "ours", &opts->writeout_stage,

                              N_("checkout our version for unmerged files"),
                              2, PARSE_OPT_NONEG),
                              N_("checkout our version for unmerged files"),
                              2, PARSE_OPT_NONEG),

-               OPT_SET_INT_F('3', "theirs", &opts.writeout_stage,
+               OPT_SET_INT_F('3', "theirs", &opts->writeout_stage,

                              N_("checkout their version for unmerged files"),
                              3, PARSE_OPT_NONEG),
                              N_("checkout their version for unmerged files"),
                              3, PARSE_OPT_NONEG),

-               OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"),
+               OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"),

                           PARSE_OPT_NOCOMPLETE),
                           PARSE_OPT_NOCOMPLETE),

-               OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
-               OPT_BOOL_F(0, "overwrite-ignore", &opts.overwrite_ignore,
+               OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")),
+               OPT_BOOL_F(0, "overwrite-ignore", &opts->overwrite_ignore,

                           N_("update ignored files (default)"),
                           PARSE_OPT_NOCOMPLETE),
                OPT_STRING(0, "conflict", &conflict_style, N_("style"),
                           N_("conflict style (merge or diff3)")),
                           N_("update ignored files (default)"),
                           PARSE_OPT_NOCOMPLETE),
                OPT_STRING(0, "conflict", &conflict_style, N_("style"),
                           N_("conflict style (merge or diff3)")),

-               OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
-               OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
+               OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
+               OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,

                         N_("do not limit pathspecs to sparse entries only")),
                OPT_BOOL(0, "no-guess", &no_dwim_new_local_branch,
                         N_("do not second guess 'git checkout <no-such-branch>'")),
                         N_("do not limit pathspecs to sparse entries only")),
                OPT_BOOL(0, "no-guess", &no_dwim_new_local_branch,
                         N_("do not second guess 'git checkout <no-such-branch>'")),

-               OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
+               OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees,

                         N_("do not check if another worktree is holding the given ref")),
                { OPTION_CALLBACK, 0, "recurse-submodules", NULL,
                            "checkout", "control recursive updating of submodules",
                            PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
                         N_("do not check if another worktree is holding the given ref")),
                { OPTION_CALLBACK, 0, "recurse-submodules", NULL,
                            "checkout", "control recursive updating of submodules",
                            PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },

-               OPT_BOOL(0, "progress", &opts.show_progress, N_("force progress reporting")),
-               OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")),
+               OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")),
+               OPT_BOOL(0, "overlay", &opts->overlay_mode, N_("use overlay mode (default)")),

                OPT_END(),
        };
 
                OPT_END(),
        };
 

-       memset(&opts, 0, sizeof(opts));
+       memset(opts, 0, sizeof(*opts));

        memset(&new_branch_info, 0, sizeof(new_branch_info));
        memset(&new_branch_info, 0, sizeof(new_branch_info));

-       opts.overwrite_ignore = 1;
-       opts.prefix = prefix;
-       opts.show_progress = -1;
-       opts.overlay_mode = -1;
+       opts->overwrite_ignore = 1;
+       opts->prefix = prefix;
+       opts->show_progress = -1;
+       opts->overlay_mode = -1;

 
 

-       git_config(git_checkout_config, &opts);
+       git_config(git_checkout_config, opts);

 
 

-       opts.track = BRANCH_TRACK_UNSPECIFIED;
+       opts->track = BRANCH_TRACK_UNSPECIFIED;

 
        argc = parse_options(argc, argv, prefix, options, checkout_usage,
                             PARSE_OPT_KEEP_DASHDASH);
 
        dwim_new_local_branch = !no_dwim_new_local_branch;
 
        argc = parse_options(argc, argv, prefix, options, checkout_usage,
                             PARSE_OPT_KEEP_DASHDASH);
 
        dwim_new_local_branch = !no_dwim_new_local_branch;

-       if (opts.show_progress < 0) {
-               if (opts.quiet)
-                       opts.show_progress = 0;
+       if (opts->show_progress < 0) {
+               if (opts->quiet)
+                       opts->show_progress = 0;

                else
                else

-                       opts.show_progress = isatty(2);
+                       opts->show_progress = isatty(2);

        }
 
        if (conflict_style) {
        }
 
        if (conflict_style) {

-               opts.merge = 1; /* implied */
+               opts->merge = 1; /* implied */

                git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
        }
 
                git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
        }
 

-       if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
+       if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)

                die(_("-b, -B and --orphan are mutually exclusive"));
 
                die(_("-b, -B and --orphan are mutually exclusive"));
 

-       if (opts.overlay_mode == 1 && opts.patch_mode)
+       if (opts->overlay_mode == 1 && opts->patch_mode)

                die(_("-p and --overlay are mutually exclusive"));
 
        /*
                die(_("-p and --overlay are mutually exclusive"));
 
        /*


@@ -1424,14 +1425,14 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
         * and new_branch_force and new_orphan_branch will tell us which one of
         * -b/-B/--orphan is being used.
         */
         * and new_branch_force and new_orphan_branch will tell us which one of
         * -b/-B/--orphan is being used.
         */

-       if (opts.new_branch_force)
-               opts.new_branch = opts.new_branch_force;
+       if (opts->new_branch_force)
+               opts->new_branch = opts->new_branch_force;

 
 

-       if (opts.new_orphan_branch)
-               opts.new_branch = opts.new_orphan_branch;
+       if (opts->new_orphan_branch)
+               opts->new_branch = opts->new_orphan_branch;

 
        /* --track without -b/-B/--orphan should DWIM */
 
        /* --track without -b/-B/--orphan should DWIM */

-       if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
+       if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {

                const char *argv0 = argv[0];
                if (!argc || !strcmp(argv0, "--"))
                        die(_("--track needs a branch name"));
                const char *argv0 = argv[0];
                if (!argc || !strcmp(argv0, "--"))
                        die(_("--track needs a branch name"));


@@ -1440,7 +1441,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                argv0 = strchr(argv0, '/');
                if (!argv0 || !argv0[1])
                        die(_("missing branch name; try -b"));
                argv0 = strchr(argv0, '/');
                if (!argv0 || !argv0[1])
                        die(_("missing branch name; try -b"));

-               opts.new_branch = argv0 + 1;
+               opts->new_branch = argv0 + 1;

        }
 
        /*
        }
 
        /*


@@ -1459,56 +1460,56 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        if (argc) {
                struct object_id rev;
                int dwim_ok =
        if (argc) {
                struct object_id rev;
                int dwim_ok =

-                       !opts.patch_mode &&
+                       !opts->patch_mode &&

                        dwim_new_local_branch &&
                        dwim_new_local_branch &&

-                       opts.track == BRANCH_TRACK_UNSPECIFIED &&
-                       !opts.new_branch;
+                       opts->track == BRANCH_TRACK_UNSPECIFIED &&
+                       !opts->new_branch;

                int n = parse_branchname_arg(argc, argv, dwim_ok,
                int n = parse_branchname_arg(argc, argv, dwim_ok,

-                                            &new_branch_info, &opts, &rev,
+                                            &new_branch_info, opts, &rev,

                                             &dwim_remotes_matched);
                argv += n;
                argc -= n;
        }
 
        if (argc) {
                                             &dwim_remotes_matched);
                argv += n;
                argc -= n;
        }
 
        if (argc) {

-               parse_pathspec(&opts.pathspec, 0,
-                              opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
+               parse_pathspec(&opts->pathspec, 0,
+                              opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,

                               prefix, argv);
 
                               prefix, argv);
 

-               if (!opts.pathspec.nr)
+               if (!opts->pathspec.nr)

                        die(_("invalid path specification"));
 
                /*
                 * Try to give more helpful suggestion.
                 * new_branch && argc > 1 will be caught later.
                 */
                        die(_("invalid path specification"));
 
                /*
                 * Try to give more helpful suggestion.
                 * new_branch && argc > 1 will be caught later.
                 */

-               if (opts.new_branch && argc == 1)
+               if (opts->new_branch && argc == 1)

                        die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
                        die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),

-                               argv[0], opts.new_branch);
+                               argv[0], opts->new_branch);

 
 

-               if (opts.force_detach)
+               if (opts->force_detach)

                        die(_("git checkout: --detach does not take a path argument '%s'"),
                            argv[0]);
 
                        die(_("git checkout: --detach does not take a path argument '%s'"),
                            argv[0]);
 

-               if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
+               if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)

                        die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
                              "checking out of the index."));
        }
 
                        die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
                              "checking out of the index."));
        }
 

-       if (opts.new_branch) {
+       if (opts->new_branch) {

                struct strbuf buf = STRBUF_INIT;
 
                struct strbuf buf = STRBUF_INIT;
 

-               if (opts.new_branch_force)
-                       opts.branch_exists = validate_branchname(opts.new_branch, &buf);
+               if (opts->new_branch_force)
+                       opts->branch_exists = validate_branchname(opts->new_branch, &buf);

                else
                else

-                       opts.branch_exists =
-                               validate_new_branchname(opts.new_branch, &buf, 0);
+                       opts->branch_exists =
+                               validate_new_branchname(opts->new_branch, &buf, 0);

                strbuf_release(&buf);
        }
 
        UNLEAK(opts);
                strbuf_release(&buf);
        }
 
        UNLEAK(opts);

-       if (opts.patch_mode || opts.pathspec.nr) {
-               int ret = checkout_paths(&opts, new_branch_info.name);
+       if (opts->patch_mode || opts->pathspec.nr) {
+               int ret = checkout_paths(opts, new_branch_info.name);

                if (ret && dwim_remotes_matched > 1 &&
                    advice_checkout_ambiguous_remote_branch_name)
                        advise(_("'%s' matched more than one remote tracking branch.\n"
                if (ret && dwim_remotes_matched > 1 &&
                    advice_checkout_ambiguous_remote_branch_name)
                        advise(_("'%s' matched more than one remote tracking branch.\n"


@@ -1527,6 +1528,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                               dwim_remotes_matched);
                return ret;
        } else {
                               dwim_remotes_matched);
                return ret;
        } else {

-               return checkout_branch(&opts, &new_branch_info);
+               return checkout_branch(opts, &new_branch_info);

        }
 }
        }
 }