summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:53 (GMT)
commit3942920966b4392c52c09f66dda391d9c330f0f7 (patch)
treed1245dc0d86064a3450d1b08beb4207cf0f8458d /submodule.h
parent1ed943e9ae5172088654f25b0a35c8425eee9b2f (diff)
parent8eda5efa1269a6117b86a97a309eb3a195b5f087 (diff)
downloadgit-3942920966b4392c52c09f66dda391d9c330f0f7.zip
git-3942920966b4392c52c09f66dda391d9c330f0f7.tar.gz
git-3942920966b4392c52c09f66dda391d9c330f0f7.tar.bz2
Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'
The core.worktree setting in a submodule repository should not be pointing at a directory when the submodule loses its working tree (e.g. getting deinit'ed), but the code did not properly maintain this invariant. * sb/submodule-unset-core-worktree-when-worktree-is-lost: submodule deinit: unset core.worktree submodule--helper: fix BUG message in ensure_core_worktree submodule: unset core.worktree if no working tree is present submodule update: add regression test with old style setups
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h
index a680214..9e18e9b 100644
--- a/submodule.h
+++ b/submodule.h
@@ -131,6 +131,8 @@ int submodule_move_head(const char *path,
const char *new_head,
unsigned flags);
+void submodule_unset_core_worktree(const struct submodule *sub);
+
/*
* Prepare the "env_array" parameter of a "struct child_process" for executing
* a submodule by clearing any repo-specific environment variables, but