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.
This commit is contained in:
parent
ccef66b55a
commit
b5b425074e
10
read-tree.c
10
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)
|
||||
|
Loading…
Reference in New Issue
Block a user