diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-18 13:53:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-18 13:53:29 -0800 |
| commit | 5cc9522b1575f832db8fd9dc4974a8a67c59dcb8 (patch) | |
| tree | e56a8e9defb059735be0e9a1d7cd97ec2842c4ee /submodule.h | |
| parent | 7455e33cba53e015982ea6c61c49c2cfbadd7141 (diff) | |
| parent | 679e3693aba0c17af60c031f7eef68f2296b8dad (diff) | |
| download | git-5cc9522b1575f832db8fd9dc4974a8a67c59dcb8.tar.xz | |
Merge branch 'gc/branch-recurse-submodules'
"git branch" learned the "--recurse-submodules" option.
* gc/branch-recurse-submodules:
branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks
branch: add --recurse-submodules option for branch creation
builtin/branch: consolidate action-picking logic in cmd_branch()
branch: add a dry_run parameter to create_branch()
branch: make create_branch() always create a branch
branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 6bd2c99fd9..784ceffc0e 100644 --- a/submodule.h +++ b/submodule.h @@ -54,6 +54,9 @@ int git_default_submodule_config(const char *var, const char *value, void *cb); struct option; int option_parse_recurse_submodules_worktree_updater(const struct option *opt, const char *arg, int unset); +int is_tree_submodule_active(struct repository *repo, + const struct object_id *treeish_name, + const char *path); int is_submodule_active(struct repository *repo, const char *path); /* * Determine if a submodule has been populated at a given 'path' by checking if |