diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 09:17:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 09:17:55 +0300 |
| commit | 7034cd094bda4edbcdff7fad1a28fcaaf9b9a040 (patch) | |
| tree | e0b837c5e5a2ea2fce3255ef59fd981e2bd30374 /unpack-trees.c | |
| parent | 559c6fc317f92a0a3994f816d3513cd322745852 (diff) | |
| parent | 53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff) | |
Sync with Git 2.24.1
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index c647a5eb58..a75b068d33 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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; } |