diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-05 22:35:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 22:35:00 (GMT) |
| commit | ff5134b2fffe202fb48498f15d6e47673f9bd6b2 (patch) | |
| tree | 4b9eed59b70cfbe4b66281ecb25e4f26997df4fc /submodule.c | |
| parent | b5c71cc33d8dbd0b95fb05e630fe54f8063467f1 (diff) | |
| parent | a9472afb6328e22cdaea4225d3b36b97d2e9e704 (diff) | |
| download | git-ff5134b2fffe202fb48498f15d6e47673f9bd6b2.zip git-ff5134b2fffe202fb48498f15d6e47673f9bd6b2.tar.gz git-ff5134b2fffe202fb48498f15d6e47673f9bd6b2.tar.bz2 | |
Merge branch 'pb/recurse-submodule-in-worktree-fix'
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
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule.c b/submodule.c index 5abef19..3a184b6 100644 --- a/submodule.c +++ b/submodule.c @@ -1822,7 +1822,7 @@ out: void submodule_unset_core_worktree(const struct submodule *sub) { char *config_path = xstrfmt("%s/modules/%s/config", - get_git_common_dir(), sub->name); + get_git_dir(), sub->name); if (git_config_set_in_file_gently(config_path, "core.worktree", NULL)) warning(_("Could not unset core.worktree setting in submodule '%s'"), @@ -1925,7 +1925,7 @@ int submodule_move_head(const char *path, ABSORB_GITDIR_RECURSE_SUBMODULES); } else { char *gitdir = xstrfmt("%s/modules/%s", - get_git_common_dir(), sub->name); + get_git_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 0); free(gitdir); @@ -1935,7 +1935,7 @@ int submodule_move_head(const char *path, if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { char *gitdir = xstrfmt("%s/modules/%s", - get_git_common_dir(), sub->name); + get_git_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 1); free(gitdir); } |