Merge branch 'jk/submodule-c-credential' into js/http-custom-headers

* jk/submodule-c-credential:
submodule: stop sanitizing config options
submodule: use prepare_submodule_repo_env consistently
submodule--helper: move config-sanitizing to submodule.c
submodule: export sanitized GIT_CONFIG_PARAMETERS
t5550: break submodule config test into multiple sub-tests
t5550: fix typo in $HTTPD_URL
git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
git: submodule honor -c credential.* from command line
quote: implement sq_quotef()
submodule: fix segmentation fault in submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: check argc count for git submodule--helper clone
submodule: don't pass empty string arguments to submodule--helper clone

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc config.c
Simple merge

diff --cc git-submodule.sh
index 43c68deee9db2b243d39eba704878eb7551ada2d,b1c056c71567522e7b1bdb94bacf10f70743e024..b9469e7db6ed3bb4844727897325f1dd5380303f
--- 1/git-submodule.sh
--- 2/git-submodule.sh
+++ b/git-submodule.sh
@@@ -591,24 -602,6 +602,24 @@@ cmd_deinit(
        done
  }
  
-       clear_local_git_env
 +is_tip_reachable () (
-       clear_local_git_env
++      sanitize_submodule_env &&
 +      cd "$1" &&
 +      rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
 +      test -z "$rev"
 +)
 +
 +fetch_in_submodule () (
++      sanitize_submodule_env &&
 +      cd "$1" &&
 +      case "$2" in
 +      '')
 +              git fetch ;;
 +      *)
 +              git fetch $(get_default_remote) "$2" ;;
 +      esac
 +)
 +
  #
  # Update each submodule path to correct revision, using clone and checkout as needed
  #

diff --cc submodule.c
Simple merge

diff --cc t/t1300-repo-config.sh
Simple merge