summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 20:26:31 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:26:55 (GMT)
commitd3ac8c3f27a507d0489d18b51d6deba6364a99ce (patch)
tree7571888b2d487ce6d825045231f02fb1b97dc6a8 /unpack-trees.c
parent924c623e1c71b98da608f980a97f9730c021ba44 (diff)
parent66d2a6159f511924e7e0b8a21c93538879bfd622 (diff)
downloadgit-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.zip
git-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.tar.gz
git-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.tar.bz2
Sync with 2.14.6
* maint-2.14: (28 commits) 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 clone --recurse-submodules: prevent name squatting on Windows is_ntfs_dotgit(): only verify the leading segment test-path-utils: offer to run a protectNTFS/protectHFS benchmark ...
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 71b70cc..26028b7 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1809,7 +1809,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;
}