Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
commitdae477777e5d38780dabb0ebabbfd32fc89c10f6
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (17 15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (17 15:02 -0700)
tree9d445a8e480d1f058a5f75d93805bbc8c56d62bd
parent758d0773baa3732bc62838070566513df6a84239
parenta9472afb6328e22cdaea4225d3b36b97d2e9e704
Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint

The "--recurse-submodules" option of various subcommands did not
work well when run in an alternate worktree, which has been
corrected.

* pb/recurse-submodule-in-worktree-fix:
  submodule.c: use get_git_dir() instead of get_git_common_dir()
  t2405: clarify test descriptions and simplify test
  t2405: use git -C and test_commit -C instead of subshells
  t7410: rename to t2405-worktree-submodule.sh
submodule.c