diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:55:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 17:20:36 +0100 |
| commit | 25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch) | |
| tree | 4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /tools/scripts/git_submodule.py | |
| parent | 175dba21885a5bcbd031c1cbc394825b5fbb783e (diff) | |
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Diffstat (limited to 'tools/scripts/git_submodule.py')
| -rw-r--r-- | tools/scripts/git_submodule.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index a364ef650..419263799 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -185,6 +185,7 @@ class Submodule: current_shasum = subprocessCheckOutput(['git', 'show', '-s', '--oneline']).split(' ')[0] if not self.shasum.startswith(current_shasum): # In case HEAD differs check out the actual shasum we require. + subprocessCall(['git', 'fetch']) error = subprocessCall(['git', 'checkout', self.shasum]) os.chdir(oldCwd) return error @@ -220,6 +221,7 @@ class Submodule: if self.url: subprocessCall(['git', 'submodule', 'add', '-f', self.url, self.path]) + subprocessCall(['git', 'submodule', 'sync', '--', self.path]) subprocessCall(['git', 'submodule', 'init', self.path]) subprocessCall(['git', 'submodule', 'update', self.path]) |