awe here we go again with this bullshit part 9

lando · Oct 1, 2024 · 2f5ce75 · 2f5ce75
1 parent aa14fb0
commit 2f5ce75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bin/mvb.js b/bin/mvb.js
@@ -113,15 +113,14 @@ const exec = createExec({cwd: options.tmpDir, debug});
 // start it up
 log('collecting version information from %s...', magenta(gitDir));
 
-// checkout branch
-await exec('git', ['checkout', getBranch()]);
-
-// lets make sure the source repo at least has all the tag and branch information it needs
+// lets make sure the source repo at least has all the tag information it needs
 const updateArgs = ['fetch', 'origin', '--tags', '--no-filter'];
 // if shallow then add to update refs
 if (getStdOut('git rev-parse --is-shallow-repository', {trim: true}) === 'true') updateArgs.push('--unshallow');
 // update all refs
 await exec('git', updateArgs);
+// checkout branch
+await exec('git', ['checkout', getBranch()]);
 
 await exec('git', ['status']);
 await exec('git', ['--no-pager', 'tag']);

diff --git a/utils/get-tags.js b/utils/get-tags.js
@@ -38,7 +38,7 @@ export default function async(
   if (versions.length > 0) {
     aliases.edge = versions[0];
     aliases.stable = versions.filter(version => semver.prerelease(version) === null)[0];
-    aliases.dev = getStdOut(`git describe --tags --always --abbrev=1 --match="${match}" ${getBranch(cwd)}`, {trim: true});
+    aliases.dev = getStdOut(`git describe --tags --always --abbrev=1 --match="${match}" ${getBranch(cwd)}`, opts);
   }
   debug('generated aliases %o', aliases);