From b5b425074e5f84f261b1290b1a83eca635c49147 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 7 Jun 2005 15:17:33 -0700 Subject: [PATCH] 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. --- read-tree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/read-tree.c b/read-tree.c index 8eb24321..cf6d28e2 100644 --- 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) -- 2.11.0