libdragon 11.0.1 → 11.0.2

package/modules/actions/init.js

@@ -289,7 +289,7 @@ module.exports = /** @type {const} */ ({
   usage: {
     name: 'init',
     summary: 'Create a libdragon project in the current directory.',
-    description: `Creates a libdragon project in the current directory. Every libdragon project will have its own docker container instance. If you are in a git repository or an NPM project, libdragon will be initialized at their root also marking there with a \`.libdragon\` folder. Do not remove the \`.libdragon\` folder and commit its contents if you are using source control, as it keeps persistent libdragon project information.
+    description: `Creates a libdragon project in the current directory. Every libdragon project will have its own docker container instance. If you are in a git repository or an NPM project, libdragon will be initialized at their root also marking there with a \`.libdragon\` folder. When running in a submodule, initializion will take place at that level rather than the superproject. Do not remove the \`.libdragon\` folder and commit its contents if you are using source control, as it keeps persistent libdragon project information.
 
     By default, a git repository and a submodule at \`./libdragon\` will be created to automatically update the vendored libdragon files on subsequent \`update\`s. If you intend to opt-out from this feature, see the \`--strategy manual\` flag to provide your self-managed libdragon copy. The default behaviour is intended for users who primarily want to consume libdragon as is.
 

package/modules/actions/utils.js

@@ -242,7 +242,19 @@ async function initGitAndCacheContainerId(libdragonInfo) {
     await runGitMaybeHost(libdragonInfo, ['init']);
   }
 
-  const gitFolder = path.join(libdragonInfo.root, '.git');
+  const rootGitFolder = (
+    await spawnProcess('git', [
+      'rev-parse',
+      '--show-superproject-working-tree',
+    ]).catch(() => {
+      // Probably host does not have git, can ignore
+      return '';
+    })
+  ).trim();
+
+  // Fallback to the potential git root on the project root if there is no parent
+  // git project.
+  const gitFolder = path.join(rootGitFolder || libdragonInfo.root, '.git');
   if (await dirExists(gitFolder)) {
     await fs.writeFile(
       path.join(gitFolder, CACHED_CONTAINER_FILE),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libdragon",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "description": "This is a docker wrapper for libdragon",
   "main": "index.js",
   "engines": {