On Tue, Feb 14, 2017 at 04:34:09PM -0800, Stefan Beller wrote: > Integrate updating the submodules into git checkout, with the same > safety promises that git-checkout has, i.e. not throw away data unless > asked to. This is done by first checking if the submodule is at the same > sha1 as it is recorded in the superproject. If there are changes we stop > proceeding the checkout just like it is when checking out a file that > has local changes. > > The integration happens in the code that is also used in other commands > such that it will be easier in the future to make other commands aware > of submodule. > > This also solves d/f conflicts in case you replace a file/directory > with a submodule or vice versa. > > The patches are still a bit rough, but the overall series seems > promising enough to me that I want to put it out here. > > Any review, specifically on the design level welcome! Overall, I'm very pleased with this. I don't really have any design-level comments at this point, only small nits. I'm considering building and testing it out at work, where this would be extremely useful. I'm therefore hoping to see how it works under real-world conditions shortly. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature