From 25ff83bc7b3e921aa540b88f6c848a78ee7d461f Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 25 Mar 2014 14:55:56 +0100 Subject: Update patches to stable branch 1750 Change-Id: I85149bf4405420813d07bee5259f11a192e86a73 Reviewed-by: Jocelyn Turcotte Reviewed-by: Zoltan Arvai --- tools/scripts/git_submodule.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/scripts/git_submodule.py') 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]) -- cgit v1.2.3