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

Sync with 2.21.1

* maint-2.21: (42 commits)
  Git 2.21.1
  mingw: sh arguments need quoting in more circumstances
  mingw: fix quoting of empty arguments for `sh`
  mingw: use MSYS2 quoting even when spawning shell scripts
  mingw: detect when MSYS2's sh is to be spawned more robustly
  t7415: drop v2.20.x-specific work-around
  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
  ...
---

5421ddd8d08df7288538a5ca05aeeeaa789a7ccd
diff --cc fsck.c
index 4703f55561,35bfb7f90e..fc4cb6ab91
--- a/fsck.c
+++ b/fsck.c
@@@ -604,8 -605,8 +605,8 @@@ static int fsck_tree(struct tree *item
  	o_name = NULL;
  
  	while (desc.size) {
 -		unsigned mode;
 +		unsigned short mode;
- 		const char *name;
+ 		const char *name, *backslash;
  		const struct object_id *oid;
  
  		oid = tree_entry_extract(&desc, &name, &mode);
diff --cc git-submodule.sh
index c7f58c5756,f2d4d177b2..58713c5467
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -548,9 -544,9 +553,10 @@@ cmd_update(
  		${reference:+"$reference"} \
  		${dissociate:+"--dissociate"} \
  		${depth:+--depth "$depth"} \
+ 		${require_init:+--require-init} \
  		$recommend_shallow \
  		$jobs \
 +		-- \
  		"$@" || echo "#unmatched" $?
  	} | {
  	err=
diff --cc transport-helper.c
index 6b05a88faf,d4683c4d0f..f828a6da68
--- a/transport-helper.c
+++ b/transport-helper.c
@@@ -423,8 -421,9 +423,9 @@@ static int get_importer(struct transpor
  	struct helper_data *data = transport->data;
  	int cat_blob_fd, code;
  	child_process_init(fastimport);
 -	fastimport->in = helper->out;
 +	fastimport->in = xdup(helper->out);
  	argv_array_push(&fastimport->args, "fast-import");
+ 	argv_array_push(&fastimport->args, "--allow-unsafe-features");
  	argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
  
  	if (data->bidi_import) {