]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sb/submodule-path-misc-bugs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:17:16 +0000 (15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:17:16 +0000 (15:17 -0700)
"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

1  2 
git-submodule.sh
t/t7406-submodule-update.sh

index cd749f473c5fc8bdd16018c5b735a215176230bb,753a90d3071d1917495ca725fe15a944f84b6f60..2a84d7e66a0e6c2bbd0bee1c3e796e4580feaea9
@@@ -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
                        ) ||
Simple merge