From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2016 22:17:16 +0000 (-0700)
Subject: Merge branch 'sb/submodule-path-misc-bugs'
X-Git-Tag: v2.9.0-rc0~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a0f105a217b243f348c6e9c621ba7a12bff8b97;p=git

Merge branch 'sb/submodule-path-misc-bugs'

"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.

* sb/submodule-path-misc-bugs:
  t7407: make expectation as clear as possible
  submodule update: test recursive path reporting from subdirectory
  submodule update: align reporting path for custom command execution
  submodule status: correct path handling in recursive submodules
  submodule update --init: correct path handling in recursive submodules
  submodule foreach: correct path display in recursive submodules
---

6a0f105a217b243f348c6e9c621ba7a12bff8b97
diff --cc git-submodule.sh
index cd749f473c,753a90d307..2a84d7e66a
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -1156,7 -1158,8 +1156,8 @@@ cmd_status(
  		then
  			(
  				prefix="$displaypath/"
 -				clear_local_git_env
 +				sanitize_submodule_env
+ 				wt_prefix=
  				cd "$sm_path" &&
  				eval cmd_status
  			) ||