Merge branch 'ks/branch-set-upstream'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2b3b768effd75e5d12d2c1828eb080f15c91895f..2e1d2376d24043a75adb9bbc69724591bcc2d5c3 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -527,6 +527,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                init_tree_desc(&trees[1], tree->buffer, tree->size);
 
                ret = unpack_trees(2, trees, &topts);
+               clear_unpack_trees_porcelain(&topts);
                if (ret == -1) {
                        /*
                         * Unpack couldn't do a trivial merge; either