From: Carl Hetherington <cth@carlh.net>
Date: Thu, 30 Jul 2020 23:22:57 +0000 (+0200)
Subject: Fix bug when checking out submodules.
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=29bd2c29acf8662dfa50dac6f038500f9190ba0b;hp=5cbf25a70d834070772b26aeb50b59aef88bdab4;p=cdist.git

Fix bug when checking out submodules.
---

diff --git a/cdist b/cdist
index 7262702..39b3944 100755
--- a/cdist
+++ b/cdist
@@ -945,14 +945,14 @@ class Tree(object):
             paths = command_and_read('git config --file .gitmodules --get-regexp path')
             urls = command_and_read('git config --file .gitmodules --get-regexp url')
             for path, url in zip(paths, urls):
+                ref = ''
+                if config.has('git_reference'):
+                    url = url.split(' ')[1]
+                    ref_path = os.path.join(config.get('git_reference'), os.path.basename(url))
+                    if os.path.exists(ref_path):
+                        ref = '--reference %s' % ref_path
                 path = path.split(' ')[1]
-                url = url.split(' ')[1]
-            ref = ''
-            if config.has('git_reference'):
-                ref_path = os.path.join(config.get('git_reference'), os.path.basename(url))
-                if os.path.exists(ref_path):
-                    ref = '--reference %s' % ref_path
-            command('git submodule --quiet update %s %s' % (ref, path))
+                command('git submodule --quiet update %s %s' % (ref, path))
 
         if os.path.exists('%s/wscript' % proj):
             v = read_wscript_variable(proj, "VERSION");