Merge branch 'lt/oneway' into next

* lt/oneway:
  read-tree -u one-way merge fix to check out locally modified paths.

diff --cc read-tree.c
index 7c830312c403c328dc278d57fecb8d4381cbf2c3,59b6a6bff9bc0b2dc7c922bf8e8b16cf36573fc7..3f0233954725397c8783f544f2f8d27125b82a13
--- 1/read-tree.c
--- 2/read-tree.c
+++ b/read-tree.c
@@@ -718,11 -683,12 +718,14 @@@ static int oneway_merge(struct cache_en
                return error("Cannot do a oneway merge of %d trees",
                             merge_size);
  
 -      if (!a)
 +      if (!a) {
 +              invalidate_ce_path(old);
                return deleted_entry(old, NULL);
 +      }
        if (old && same(old, a)) {
+               struct stat st;
+               if (lstat(old->name, &st) || ce_match_stat(old, &st, 1))
+                       old->ce_flags |= htons(CE_UPDATE);
                return keep_entry(old);
        }
        return merged_entry(a, NULL);