summaryrefslogtreecommitdiffstats
path: root/init-repository.py
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-07-15 17:54:42 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-07-16 11:40:29 +0200
commit62b4ca99b871dbdcb271c3f3b533c6d500ebe6f0 (patch)
tree42cda6acfcc8cb92fc5b2bc7d8dba8bcff582ff2 /init-repository.py
parent1a9e2540113ad0a8542f573a6324a1f4b053e757 (diff)
Unstage upstream repositories after initializing them
This prevents accidentally pushing automatically staged upstream submodules which are meant to be local-only. Change-Id: I565fe8f3e0157a6623338ba7a236941184a98b8e Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'init-repository.py')
-rwxr-xr-xinit-repository.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/init-repository.py b/init-repository.py
index eba61c475..fa2ef5661 100755
--- a/init-repository.py
+++ b/init-repository.py
@@ -159,6 +159,10 @@ def initUpstreamSubmodules():
chromiumSubmodule.initialize()
chromiumSubmodule.initSubmodules()
+ # Unstage repositories so we do not accidentally commit them.
+ subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/ninja'])
+ subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/chromium'])
+
def initSnapshot():
snapshot = GitSubmodule.Submodule()
snapshot.path = 'src/3rdparty'