git-read-tree: make one-way merge also honor the "update" flag

It didn't set CE_UPDATE before, so "-u" was a no-op.

diff --git a/read-tree.c b/read-tree.c
index 8eb2432127e255347b2e6116d3f7ff57b4e06ba5..cf6d28e2c9ee689a5ea49d715bc56773b266efa8 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -218,11 +218,11 @@ static int oneway_merge(struct cache_entry **src, struct cache_entry **dst)
 
        if (!a)
                return 0;
-       if (old && same(old, a))
-               *a = *old;
-       a->ce_flags &= ~htons(CE_STAGEMASK);
-       *dst++ = a;
-       return 1;
+       if (old && same(old, a)) {
+               *dst++ = old;
+               return 1;
+       }
+       return merged_entry(a, NULL, dst);
 }
 
 static void check_updates(struct cache_entry **src, int nr)