t1000: modernize style

diff --git a/submodule.h b/submodule.h
index 9454806dc5df9a80aa4bf1f7c647404e9df1b3a7..b7576d6f43fee1d7a537bb61cbe02e5780dffa38 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -65,8 +65,9 @@ int merge_submodule(unsigned char result[20], const char *path, const unsigned c
                    const unsigned char a[20], const unsigned char b[20], int search);
 int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_name,
                struct string_list *needs_pushing);
-int push_unpushed_submodules(struct sha1_array *commits, const char *remotes_name);
-void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+extern int push_unpushed_submodules(struct sha1_array *commits,
+                                   const char *remotes_name,
+                                   int dry_run);
 int parallel_submodules(void);
 
 /*
@@ -76,4 +77,8 @@ int parallel_submodules(void);
  */
 void prepare_submodule_repo_env(struct argv_array *out);
 
+#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
+extern void absorb_git_dir_into_superproject(const char *prefix,
+                                            const char *path,
+                                            unsigned flags);
 #endif