diff --git a/package.json b/package.json index 9b34584..cbbd848 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "smartims", "private": true, - "version": "0.2.8", + "version": "0.2.9", "type": "module", "scripts": { "dev": "vite", diff --git a/server/package.json b/server/package.json index 64b0073..a8d233a 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.2.8", + "version": "0.2.9", "description": "", "main": "index.js", "scripts": { diff --git a/server/routes/system.js b/server/routes/system.js index 0ed4098..78529de 100644 --- a/server/routes/system.js +++ b/server/routes/system.js @@ -471,14 +471,14 @@ router.get('/version/remote', isAuthenticated, hasRole('admin'), async (req, res // Prepare git fetch command with auth if available const auth = await getGiteaAuth(); - let fetchCmd = 'git fetch --tags'; + let fetchCmd = 'git fetch --tags --force'; if (auth.user && auth.pass) { // Inject auth into URL const authenticatedUrl = auth.url.replace('https://', `https://${encodeURIComponent(auth.user)}:${encodeURIComponent(auth.pass)}@`); - fetchCmd = `git fetch ${authenticatedUrl} --tags`; + fetchCmd = `git fetch ${authenticatedUrl} --tags --force`; } else { - fetchCmd = `git fetch ${auth.url} --tags`; + fetchCmd = `git fetch ${auth.url} --tags --force`; } exec(fetchCmd, (err, stdout, stderr) => { diff --git a/src/platform/pages/BasicSettingsPage.tsx b/src/platform/pages/BasicSettingsPage.tsx index 75748f1..9f1afca 100644 --- a/src/platform/pages/BasicSettingsPage.tsx +++ b/src/platform/pages/BasicSettingsPage.tsx @@ -386,6 +386,8 @@ export function BasicSettingsPage() {