Merge branch 'bc/hash-transition-interop-part-1'

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 7eeaf7d20309cc775d170aaa45bb3ec8fc64bbfb..0b1d9c1dde5a8fc5cec04f13241f94b8a4378d5f 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -33,7 +33,7 @@ static struct oid_array ref_tips_after_fetch;
  * will be disabled because we can't guess what might be configured in
  * .gitmodules unless the user resolves the conflict.
  */
-int is_gitmodules_unmerged(const struct index_state *istate)
+int is_gitmodules_unmerged(struct index_state *istate)
 {
        int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
        if (pos < 0) { /* .gitmodules not found or isn't merged */
@@ -302,7 +302,7 @@ int is_submodule_populated_gently(const char *path, int *return_error_code)
 /*
  * Dies if the provided 'prefix' corresponds to an unpopulated submodule
  */
-void die_in_unpopulated_submodule(const struct index_state *istate,
+void die_in_unpopulated_submodule(struct index_state *istate,
                                  const char *prefix)
 {
        int i, prefixlen;
@@ -332,7 +332,7 @@ void die_in_unpopulated_submodule(const struct index_state *istate,
 /*
  * Dies if any paths in the provided pathspec descends into a submodule
  */
-void die_path_inside_submodule(const struct index_state *istate,
+void die_path_inside_submodule(struct index_state *istate,
                               const struct pathspec *ps)
 {
        int i, j;