From 94f583f1bcce3b1992acb50bfb6190b121a3d880 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Sat, 23 Nov 2024 16:16:41 -0500 Subject: [PATCH] improve mvb tag fetching to fix tag clobbering issues --- CHANGELOG.md | 2 ++ bin/mvb.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09c7a92..a2875f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Improved `mvb` tag fetching to ensure remote tags are canonical for version building, fixes `would clobber existing tag` error(s) + ## v1.1.0-beta.23 - [November 13, 2024](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.23) * Changed `mvb` to never cache the main/base/root build diff --git a/bin/mvb.js b/bin/mvb.js index 54e0b0e..25de672 100755 --- a/bin/mvb.js +++ b/bin/mvb.js @@ -111,7 +111,7 @@ const exec = createExec({cwd: options.tmpDir, debug}); log('setting up mvb build environment using %s...', magenta(gitDir)); // lets make sure the source repo at least has all the tag information it needs -const updateArgs = ['fetch', 'origin', '--tags', '--no-filter']; +const updateArgs = ['fetch', 'origin', '--tags', '--no-filter', '--force']; // if shallow then add to update refs if (getStdOut('git rev-parse --is-shallow-repository', {trim: true}) === 'true') updateArgs.push('--unshallow'); // fetch