builtin/branch: stop supporting the "--set-upstream" option

diff --git a/submodule.h b/submodule.h
index 623ce6ad7716aa037e2970f6847cc145c41bff69..f1aa3ffeb19e4e477295b66f85ab4cb85d24437e 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -48,7 +48,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 void load_submodule_cache(void);
 extern void gitmodules_config(void);
 extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
+extern void gitmodules_config_oid(const struct object_id *commit_oid);
 extern int is_submodule_active(struct repository *repo, const char *path);
 /*
  * Determine if a submodule has been populated at a given 'path' by checking if
@@ -99,6 +99,10 @@ extern int merge_submodule(struct object_id *result, const char *path,
                           const struct object_id *base,
                           const struct object_id *a,
                           const struct object_id *b, int search);
+
+/* Checks if there are submodule changes in a..b. */
+extern int submodule_touches_in_range(struct object_id *a,
+                                     struct object_id *b);
 extern int find_unpushed_submodules(struct oid_array *commits,
                                    const char *remotes_name,
                                    struct string_list *needs_pushing);