summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Rogers <jrogers@blackberry.com>2014-05-13 17:37:09 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-16 10:19:12 +0200
commit6da672bb374be369c9bf165deb2b1561e6dd99dd (patch)
treed8d04015ceed722c5b4f7705733fcd5041c84325
parentddade6ac151a58bb981e6061dc42d2d696b907d5 (diff)
Provide option to bypass adding the gerrit/commit hook remote.
For developers behind a firewall blocking ssh, the init-repository script will hang. Add a "--no-gerrit" argument that will skip adding the gerrit remote and commit hook. Change-Id: I130a5897f33925876922bbfea4976f24c484ef31 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rwxr-xr-xinit-repository.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/init-repository.py b/init-repository.py
index a4572b16..64f792b8 100755
--- a/init-repository.py
+++ b/init-repository.py
@@ -78,6 +78,7 @@ parser = argparse.ArgumentParser(description='Initialize QtWebEngine repository.
group = parser.add_mutually_exclusive_group()
group.add_argument('-u', '--upstream', action='store_true', help='initialize using upstream Chromium submodule')
group.add_argument('-s', '--snapshot', action='store_true', help='initialize using flat Chromium snapshot submodule (default)')
+group.add_argument('--no-gerrit', action='store_true', help='skip adding the upstream Gerrit remote and commit hook')
args = parser.parse_args()
if chromium_src:
@@ -167,8 +168,10 @@ def initSnapshot():
snapshot.initialize()
os.chdir(qtwebengine_root)
-addGerritRemote()
-installGitHooks()
+
+if not args.no_gerrit:
+ addGerritRemote()
+ installGitHooks()
print 'Configuring git to ignore all submodules. Submodule changes will not show up in "git diff"!'
subprocess.call(['git', 'config', 'diff.ignoreSubmodules', 'all'])