diff options
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/submodule.h b/submodule.h index 6a9fec6de1..c55a25ca37 100644 --- a/submodule.h +++ b/submodule.h @@ -150,9 +150,8 @@ int validate_submodule_git_dir(char *git_dir, const char *submodule_name); #define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0) #define SUBMODULE_MOVE_HEAD_FORCE (1<<1) -int submodule_move_head(const char *path, - const char *old, - const char *new_head, +int submodule_move_head(const char *path, const char *super_prefix, + const char *old_head, const char *new_head, unsigned flags); void submodule_unset_core_worktree(const struct submodule *sub); @@ -164,9 +163,8 @@ void submodule_unset_core_worktree(const struct submodule *sub); */ void prepare_submodule_repo_env(struct strvec *env); -#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) void absorb_git_dir_into_superproject(const char *path, - unsigned flags); + const char *super_prefix); /* * Return the absolute path of the working tree of the superproject, which this |