summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 20:52:10 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:27:36 (GMT)
commitbdfef0492cada3fb36f454804796bf12c79a7136 (patch)
treec79527a14ab1371d714bd600e91fc60bcde0edcd /unpack-trees.c
parent6e9e91e9cae74cd7feb9300563d40361b2b17dd2 (diff)
parenteb288bc455ac67e3ceeff90daf6f25972bb586d0 (diff)
downloadgit-bdfef0492cada3fb36f454804796bf12c79a7136.zip
git-bdfef0492cada3fb36f454804796bf12c79a7136.tar.gz
git-bdfef0492cada3fb36f454804796bf12c79a7136.tar.bz2
Sync with 2.16.6
* maint-2.16: (31 commits) 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 protect_ntfs: turn on NTFS protection by default path: also guard `.gitmodules` against NTFS Alternate Data Streams is_ntfs_dotgit(): speed it up mingw: disallow backslash characters in tree objects' file names path: safeguard `.git` against NTFS Alternate Streams Accesses ...
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 e737450..88a0b5d 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1834,7 +1834,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;
}