Use "git merge" instead of "git pull ."

diff --git a/submodule.c b/submodule.c
index 85415d0057402d40c4c9e98e3c94c41eb8dd940f..3f0a3f9419a3dead24cd8e850051f595d0b5974f 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -624,7 +624,7 @@ int fetch_populated_submodules(const struct argv_array *options,
                struct strbuf submodule_path = STRBUF_INIT;
                struct strbuf submodule_git_dir = STRBUF_INIT;
                struct strbuf submodule_prefix = STRBUF_INIT;
-               struct cache_entry *ce = active_cache[i];
+               const struct cache_entry *ce = active_cache[i];
                const char *git_dir, *name, *default_argv;
 
                if (!S_ISGITLINK(ce->ce_mode))