summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 21:46:37 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:31:12 (GMT)
commitfc346cb2925d4647ccd65177660bffab13cbe253 (patch)
tree414c061e84002c2f65ef9b3d50646128217dcac4 /unpack-trees.c
parent8104ec994ea3849a968b4667d072fedd1e688642 (diff)
parent4cd1cf31efed9b16db5035c377bfa222f5272458 (diff)
downloadgit-fc346cb2925d4647ccd65177660bffab13cbe253.zip
git-fc346cb2925d4647ccd65177660bffab13cbe253.tar.gz
git-fc346cb2925d4647ccd65177660bffab13cbe253.tar.bz2
Sync with 2.20.2
* maint-2.20: (36 commits) 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 quote-stress-test: offer to test quoting arguments for MSYS2 sh t6130/t9350: prepare for stringent Win32 path validation quote-stress-test: allow skipping some trials quote-stress-test: accept arguments to test via the command-line tests: add a helper to stress test argument quoting mingw: fix quoting of arguments Disallow dubiously-nested submodule git directories ...
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 3563daa..725351b 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -2072,7 +2072,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;
}