read-tree -m A B: prime cache-tree from the switched-to tree

diff --git a/builtin-checkout.c b/builtin-checkout.c
index ed0f318c0ce8a1c70ff3e45605c760c8bbb173f2..ffdb33aef596740890362a0e237d33131a906f45 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -5,6 +5,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "tree-walk.h"
+#include "cache-tree.h"
 #include "unpack-trees.h"
 #include "dir.h"
 #include "run-command.h"
@@ -53,9 +54,6 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
        int len;
        struct cache_entry *ce;
 
-       if (S_ISGITLINK(mode))
-               return 0;
-
        if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;