On Thu, Apr 28, 2016 at 8:28 AM, Jeff King <peff@xxxxxxxx> wrote: > On Thu, Apr 28, 2016 at 08:25:29AM -0700, Stefan Beller wrote: > >> > +test_expect_success 'cmdline credential config passes submodule update' ' >> > + # advance the submodule HEAD so that a fetch is required >> > + git commit --allow-empty -m foo && >> > + git push "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git" HEAD && >> > + sha1=$(git rev-parse HEAD) && >> > + git -C super-clone update-index --cacheinfo 160000,$sha1,sub && >> >> The use of update-index seems elegant to me, though different than >> any submodule test I wrote so far. :) > > Yeah, I actually wrestled with finding the shortest recipe to convince > git-submodule to actually call git-fetch. Suggestions welcome if there's > something more canonical. > > But I think we have to advance the submodule pointer in some way to > convince it to want to fetch (I also tried deleting the refs in the > cloned module, but that seemed hacky). > > I guess the way it would happen in real life is that the "origin" remote > ("super" here, not "super-clone") would make the change and commit the > submodule, and then "super-clone" would pull it. > > That seemed even more convoluted to me. That's what I write in the other submodule tests, because I think we should test closest to reality. Instead of deleting the refs code, another hacky way would be echo $newsha1 > .git/module/remote/origin/refs/heads/master but the update-index is less hacky, so let's keep that. I did not want to point out an issue with it, just that I was pleasantly surprised to see such a short test. Thanks, Stefan > > -Peff > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html