Merge branch 'lt/oneway' into next

* lt/oneway:
  read-tree --reset -u fix.

diff --cc read-tree.c
index 3f0233954725397c8783f544f2f8d27125b82a13,e16e91b173163f2b514e965d5e5ba7b939ffa1de..aa6172b52eeadb4f118e5145c182270342a70bf0
--- 1/read-tree.c
--- 2/read-tree.c
+++ b/read-tree.c
@@@ -718,14 -688,15 +723,17 @@@ 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);
+               if (reset) {
+                       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);