From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:16 +0000 (-0700)
Subject: Merge branch 'sb/submodule-init'
X-Git-Tag: v2.9.0-rc0~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2c96ceb57afd8c64c3e3e656f9390c95e9fbec9?hp=--cc

Merge branch 'sb/submodule-init'

Update of "git submodule" to move pieces of logic to C continues.

* sb/submodule-init:
submodule init: redirect stdout to stderr
submodule--helper update-clone: abort gracefully on missing .gitmodules
submodule init: fail gracefully with a missing .gitmodules file
submodule: port init from shell to C
submodule: port resolve_relative_url from shell to C
---

f2c96ceb57afd8c64c3e3e656f9390c95e9fbec9
diff --cc builtin/submodule--helper.c
index 3bd6883eff,7f0941ddc3..825a421fc9
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -570,8 -840,10 +906,11 @@@ static struct cmd_struct commands[] = 
  	{"list", module_list},
  	{"name", module_name},
  	{"clone", module_clone},
 +	{"sanitize-config", module_sanitize_config},
- 	{"update-clone", update_clone}
+ 	{"update-clone", update_clone},
+ 	{"resolve-relative-url", resolve_relative_url},
+ 	{"resolve-relative-url-test", resolve_relative_url_test},
+ 	{"init", module_init}
  };
  
  int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
diff --cc git-submodule.sh
index 2a84d7e66a,82e95a923b..14d02cc4bc
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -823,8 -697,9 +707,9 @@@ cmd_update(
  		if test -n "$recursive"
  		then
  			(
- 				prefix="$prefix$sm_path/"
+ 				prefix=$(relative_path "$prefix$sm_path/")
+ 				wt_prefix=
 -				clear_local_git_env
 +				sanitize_submodule_env
  				cd "$sm_path" &&
  				eval cmd_update
  			)