d37ef83ced
Silence git-hooks/pre-commit in the absence of .gitmodules (take 2).
...
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
2014-04-05 00:29:14 +00:00
0c57e250f3
git-hooks/pre-commit: Allow merging deps2submodules changes from upstream
...
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
2014-03-26 22:05:38 +00:00
994f6b3ca2
Remove "bashism" from plain shell script
...
https://codereview.chromium.org/196413021 uses [[ which isn't present
in all shells, particularly not dash which Debian uses as /bin/sh.
Instead use two simple [ conditions.
Review URL: https://codereview.chromium.org/203463010
git-svn-id: http://src.chromium.org/svn/trunk/src/build@258321 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-20 17:33:36 +00:00
623b6c921f
Silence git-hooks/pre-commit in the absence of .gitmodules.
...
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).
TBR=szager@chromium.org
Review URL: https://codereview.chromium.org/196413021
git-svn-id: http://src.chromium.org/svn/trunk/src/build@257470 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-17 18:50:47 +00:00
b9ab97b92f
Use sh instead of bash for the pre-commit hook.
...
The script looks portable enough, and using sh helps on systems without bash
in that specific location.
R=cmp@chromium.org ,szager@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19238006
git-svn-id: http://src.chromium.org/svn/trunk/src/build@214425 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-07-30 20:23:41 +00:00
693ec45d3a
Add OWNERS to git-hooks.
...
Since this folder contains arbitrary code to be run on client hosts,
it probably ought to have an OWNERS file.
Review URL: https://codereview.chromium.org/14139020
git-svn-id: http://src.chromium.org/svn/trunk/src/build@194455 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-04-16 21:16:46 +00:00
f1842890f0
File file permissions.
...
TBR=isherman@chromium.og
BUG=
Review URL: https://codereview.chromium.org/12255037
git-svn-id: http://src.chromium.org/svn/trunk/src/build@182564 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-02-14 22:51:50 +00:00
318d1bfe99
Add pre-commit hook to disallow submodule changes.
...
TBR=cmp@chromium.org ,iannucci@chromium.org
BUG=
Review URL: https://codereview.chromium.org/12260019
git-svn-id: http://src.chromium.org/svn/trunk/src/build@182555 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-02-14 22:13:42 +00:00
fischman@chromium.org
spang@chromium.org
davve@opera.com
raphael.kubo.da.costa@intel.com
szager@chromium.org