Other projects use depot_tools (which pulls in this hook) and chromium's build/
(where the hook lives) but don't use git modules (e.g. webrtc).
This first landed as r257470 but was accidentally undone by r259711.
Review URL: https://codereview.chromium.org/225583008
git-svn-id: http://src.chromium.org/svn/trunk/src/build@261931 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This also checks the 2nd parent during a merge, to allow commiting a
merge that contains newer versions of the submodules. In particular
merging chromium master into a local branch will now work.
TEST=git checkout -b test origin/master~200
git merge --no-ff --no-commit origin/master
git commit
Review URL: https://codereview.chromium.org/192443006
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259711 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
fischman@chromium.org
spang@chromium.org
davve@opera.com
raphael.kubo.da.costa@intel.com
szager@chromium.org