undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
It didn't set CE_UPDATE before, so "-u" was a no-op.
This commit is contained in:
Linus Torvalds 2005-06-07 15:17:33 -07:00
parent ccef66b55a
commit b5b425074e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
read-tree.c
View File

@ -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)