diff options
| -rw-r--r-- | builtin-checkout.c | 50 |
1 files changed, 15 insertions, 35 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index cc97724c87..9af5197b60 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -151,39 +151,29 @@ static void describe_detached_head(char *msg, struct commit *commit) strbuf_release(&sb); } -static int reset_to_new(struct tree *tree, int quiet) -{ - struct unpack_trees_options opts; - struct tree_desc tree_desc; +struct checkout_opts { + int quiet; + int merge; + int force; - memset(&opts, 0, sizeof(opts)); - opts.head_idx = -1; - opts.update = 1; - opts.reset = 1; - opts.merge = 1; - opts.fn = oneway_merge; - opts.verbose_update = !quiet; - opts.src_index = &the_index; - opts.dst_index = &the_index; - parse_tree(tree); - init_tree_desc(&tree_desc, tree->buffer, tree->size); - if (unpack_trees(1, &tree_desc, &opts)) - return 128; - return 0; -} + char *new_branch; + int new_branch_log; + enum branch_track track; +}; -static int reset_clean_to_new(struct tree *tree, int quiet) +static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree) { struct unpack_trees_options opts; struct tree_desc tree_desc; memset(&opts, 0, sizeof(opts)); opts.head_idx = -1; - opts.skip_unmerged = 1; + opts.update = worktree; + opts.skip_unmerged = !worktree; opts.reset = 1; opts.merge = 1; opts.fn = oneway_merge; - opts.verbose_update = !quiet; + opts.verbose_update = !o->quiet; opts.src_index = &the_index; opts.dst_index = &the_index; parse_tree(tree); @@ -193,16 +183,6 @@ static int reset_clean_to_new(struct tree *tree, int quiet) return 0; } -struct checkout_opts { - int quiet; - int merge; - int force; - - char *new_branch; - int new_branch_log; - enum branch_track track; -}; - struct branch_info { const char *name; /* The short name used */ const char *path; /* The full name of a real branch */ @@ -227,7 +207,7 @@ static int merge_working_tree(struct checkout_opts *opts, read_cache(); if (opts->force) { - ret = reset_to_new(new->commit->tree, opts->quiet); + ret = reset_tree(new->commit->tree, opts, 1); if (ret) return ret; } else { @@ -291,12 +271,12 @@ static int merge_working_tree(struct checkout_opts *opts, add_files_to_cache(NULL, NULL, 0); work = write_tree_from_memory(); - ret = reset_to_new(new->commit->tree, opts->quiet); + ret = reset_tree(new->commit->tree, opts, 1); if (ret) return ret; merge_trees(new->commit->tree, work, old->commit->tree, new->name, "local", &result); - ret = reset_clean_to_new(new->commit->tree, opts->quiet); + ret = reset_tree(new->commit->tree, opts, 0); if (ret) return ret; } |