diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-26 18:53:55 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-07-28 21:59:54 +0200 |
| commit | dcfabadeb3ea2fd439b013ef24c41c81780d802a (patch) | |
| tree | 1e4a9f3a4d708aa3ecebfdd07b2582ca545959ed /patches/patch-chromium.sh | |
| parent | 53906c4e3b5c4ee7093a582c7923bba5a377c3a3 (diff) | |
Make init-repository.py properly reset all submodules.
With this patch init-repository.py will also abort uncommited
git am/merge/rebase sessions and it will do a git reset --hard
on every submodule.
We are no longer executing a 'git submodule update --recursive'
in the patch-chromium.sh script, since init-repository.py
takes care of checking out the proper revisions.
Change-Id: I6cc50944d888ffce5e3d282500dffe3daffecdf4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
| -rwxr-xr-x | patches/patch-chromium.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 4843a8441..41f27a992 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -54,10 +54,6 @@ if [ ! -d "$CHROMIUM_SRC_DIR" ]; then exit 1; fi -echo "Checking out Chromium HEADs..." -cd $QTWEBENGINE_SRC_DIR -git submodule update --recursive - cd $CHROMIUM_SRC_DIR echo "Entering $PWD" |