t1430: remove refs using test-tool

[thirdparty/git.git] / reset.c

diff --git a/reset.c b/reset.c
index 79310ae071b7e897e71d6778926b6e7d21869647..f214df3d96ca218a25c780b2dc79ca4ca76999de 100644 (file)
--- a/reset.c
+++ b/reset.c
@@ -56,9 +56,10 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
        unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
        unpack_tree_opts.update = 1;
        unpack_tree_opts.merge = 1;
+       unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
        init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
        if (!detach_head)
-               unpack_tree_opts.reset = 1;
+               unpack_tree_opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
 
        if (repo_read_index_unmerged(r) < 0) {
                ret = error(_("could not read index"));