From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 4 Dec 2019 20:38:25 +0000 (+0100)
Subject: Sync with 2.15.4
X-Git-Tag: v2.16.6~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ac92fed5b63176e653c3c42e2b66cdd203c906f;p=thirdparty%2Fgit.git

Sync with 2.15.4

* maint-2.15: (29 commits)
  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
  clone --recurse-submodules: prevent name squatting on Windows
  is_ntfs_dotgit(): only verify the leading segment
  ...
---

9ac92fed5b63176e653c3c42e2b66cdd203c906f
diff --cc builtin/submodule--helper.c
index 13312ac808,0d03fa8bf9..3c4b3b7032
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -13,17 -13,8 +13,18 @@@
  #include "remote.h"
  #include "refs.h"
  #include "connect.h"
 +#include "revision.h"
 +#include "diffcore.h"
 +#include "diff.h"
+ #include "dir.h"
  
 +#define OPT_QUIET (1 << 0)
 +#define OPT_CACHED (1 << 1)
 +#define OPT_RECURSIVE (1 << 2)
 +
 +typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
 +				  void *cb_data);
 +
  static char *get_default_remote(void)
  {
  	char *dest = NULL, *ret;
diff --cc environment.c
index 63ac38a46f,bca118772b..31a39e4a43
--- a/environment.c
+++ b/environment.c
@@@ -73,10 -73,9 +73,10 @@@ enum log_refs_config log_all_ref_update
  int protect_hfs = PROTECT_HFS_DEFAULT;
  
  #ifndef PROTECT_NTFS_DEFAULT
- #define PROTECT_NTFS_DEFAULT 0
+ #define PROTECT_NTFS_DEFAULT 1
  #endif
  int protect_ntfs = PROTECT_NTFS_DEFAULT;
 +const char *core_fsmonitor;
  
  /*
   * The character that begins a commented line in user-editable file