On Sun, May 28, 2017 at 7:44 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > John Shahid <jvshahid@xxxxxxxxx> writes: > >> It looks like the git push recurse-submodules behavior has changed. >> Currently with 2.13 you cannot run "git push >> --recurse-submodules=on-demand" if the parent repo is on a different >> branch than the sub repos, e.g. parent repo is on "develop" and >> sub-repo on "master". I created a test that can be found here [1]. >> >> A bisect shows that the change to propagate refspec [2] to the >> submodules is the culprit. imho this is an undesired change in >> behavior. I looked at the code but couldn't see an easy way to fix >> this issue without breaking the feature mentioned above. The only >> option I can think of is to control the refspec propagation behavior >> using a flag, e.g. "--propagate-refspecs" or add another >> recurse-submodules option, e.g. "--recurse-submodules=propagate" >> >> What do you all think ? >> >> [1] https://gist.github.com/jvshahid/b778702cc3d825c6887d2707e866a9c8 >> [2] https://github.com/git/git/commit/06bf4ad1db92c32af38e16d9b7f928edbd647780 > > Brandon? I cannot quite tell from the report what "has changed" > refers to, what failures "you cannot run" gets, and if that is a > desirable thing to do (i.e. if letting the user run it in such a > configuration would somehow break things, actively erroring out may > be a deliberate change) or not (i.e. an unintended regression). > Before the refspec was passed down into the submodules, we'd just invoke "git push" in the submodule assuming the user setup a remote tracking branch and a push strategy such that "git push" would do the right thing. And because the submodule is configured independently, it doesn't matter which branch you're on in the superproject. Looking at the test[1], you run "git push --recurse-submodules" without any remote/branch that was called out in the commit message[2] to not have changed. Is that understanding correct? Looking at the test cases of [2] we did not test for explicit "still works with no args given", though one could have expected we'd have a test for that already. :/ Thanks, Stefan