attr: push the bare repo check into read_attr()

diff --git a/submodule.h b/submodule.h
index 23d76682b1ea123d040a29f6f9613c3e1794f87d..b7576d6f43fee1d7a537bb61cbe02e5780dffa38 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -68,7 +68,6 @@ int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_nam
 extern int push_unpushed_submodules(struct sha1_array *commits,
                                    const char *remotes_name,
                                    int dry_run);
-void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
 int parallel_submodules(void);
 
 /*
@@ -78,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