mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with Git 2.24.1

Browse Source
This commit is contained in:
Junio C Hamano
2019-12-09 22:17:55 -08:00
parent 559c6fc317 53a06cf39b
commit 7034cd094b
47 changed files with 992 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unpack-trees.c
View File

@ -2063,7 +2063,8 @@ static int merged_entry(const struct cache_entry *ce,
invalidate_ce_path(old, o);
}
do_add_entry(o, merge, update, CE_STAGEMASK);
if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
return -1;
return 1;
}