Glen Choo <chooglen@xxxxxxxxxx> writes: > Emily Shaffer <emilyshaffer@xxxxxxxxxx> writes: > >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 652861aa66..59dffda775 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -449,6 +449,9 @@ cmd_update() >> ;; >> esac >> >> + # Note that the submodule is a submodule. >> + git -C "$sm_path" config submodule.hasSuperproject "true" >> + >> if test -n "$recursive" >> then >> ( > > This hunk has a textual conflict with 'ar/submodule-update reroll pt > 2', but the fix is easy - just teach "git submodule--helper update" to > set the config in C.
