Start the 2.46 cycle

[thirdparty/git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index bfaa9da1868af5e201db3a831b283924cf7c8a89..c55a25ca37d2425d398f59c98ff177c8dfa6fdaf 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -72,7 +72,7 @@ void die_path_inside_submodule(struct index_state *istate,
 enum submodule_update_type parse_submodule_update_type(const char *value);
 int parse_submodule_update_strategy(const char *value,
                                    struct submodule_update_strategy *dst);
-const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
+const char *submodule_update_type_to_string(enum submodule_update_type type);
 void handle_ignore_submodules_arg(struct diff_options *, const char *);
 void show_submodule_diff_summary(struct diff_options *o, const char *path,
                            struct object_id *one, struct object_id *two,
@@ -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