]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 758d077 a9472af)
Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:21 +0000 (15:02 -0700)
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

1  2 
submodule.c patch | diff1 | diff2 | blob | history

diff --cc submodule.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.