From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 4 Dec 2019 21:31:10 +0000 (+0100)
Subject: Sync with 2.19.3
X-Git-Tag: v2.24.1~1^2~1^2~1^2~3^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d851d94151734db8234b0a3dba7783bce36dd00b;p=thirdparty%2Fgit.git

Sync with 2.19.3

* maint-2.19: (34 commits)
  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
  protect_ntfs: turn on NTFS protection by default
  path: also guard `.gitmodules` against NTFS Alternate Data Streams
  ...
---

d851d94151734db8234b0a3dba7783bce36dd00b
diff --cc builtin/submodule--helper.c
index d38113a31a,382e823b3c..b93d624a85
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -1545,13 -1482,11 +1555,13 @@@ struct submodule_update_clone 
  	/* failed clones to be retried again */
  	const struct cache_entry **failed_clones;
  	int failed_clones_nr, failed_clones_alloc;
 +
 +	int max_jobs;
  };
  #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
- 	SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \
+ 	SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, 0, \
  	NULL, NULL, NULL, \
 -	STRING_LIST_INIT_DUP, 0, NULL, 0, 0}
 +	NULL, 0, 0, 0, NULL, 0, 0, 0}
  
  
  static void next_submodule_warn_missing(struct submodule_update_clone *suc,