summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 22:06:31 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:31:30 (GMT)
commit7fd9fd94fb8f23b86578ed86906b8caf0417db82 (patch)
tree816a507d8bc5b84c18243b642896e18180ead938 /unpack-trees.c
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff)
parentd9589d4051537c387b70dc76e430c61b4c85a86d (diff)
downloadgit-7fd9fd94fb8f23b86578ed86906b8caf0417db82.zip
git-7fd9fd94fb8f23b86578ed86906b8caf0417db82.tar.gz
git-7fd9fd94fb8f23b86578ed86906b8caf0417db82.tar.bz2
Sync with 2.22.2
* maint-2.22: (43 commits) Git 2.22.2 Git 2.21.1 mingw: sh arguments need quoting in more circumstances mingw: fix quoting of empty arguments for `sh` mingw: use MSYS2 quoting even when spawning shell scripts mingw: detect when MSYS2's sh is to be spawned more robustly t7415: drop v2.20.x-specific work-around Git 2.20.2 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x Git 2.19.3 Git 2.18.2 Git 2.17.3 Git 2.16.6 test-drop-caches: use `has_dos_drive_prefix()` Git 2.15.4 Git 2.14.6 mingw: handle `subst`-ed "DOS drives" mingw: refuse to access paths with trailing spaces or periods mingw: refuse to access paths with illegal characters unpack-trees: let merged_entry() pass through do_add_entry()'s errors ...
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 62276d4..9346c66 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -2050,7 +2050,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;
}