From 1e8873fbb6c765f8eddc3b41db6395a336d13eaf Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 2 May 2024 15:29:26 +0300 Subject: [PATCH] tools: protect from cleaning during `v up`, only ./v , not any matching folder --- cmd/tools/vup.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/tools/vup.v b/cmd/tools/vup.v index e1f64b9763..6d98ce59ee 100644 --- a/cmd/tools/vup.v +++ b/cmd/tools/vup.v @@ -69,12 +69,12 @@ fn (app App) update_from_master() { // initialize the folder, as if it had been cloned: app.git_command('git init') app.git_command('git remote add origin https://github.com/vlang/v') - app.git_command('git remote set-head origin master') app.git_command('git fetch') + app.git_command('git remote set-head origin master') app.git_command('git reset --hard origin/master') // Note: in the .zip files, thirdparty/tcc/.git is missing to save space. // -> Git clean below will try to remove thirdparty/tcc/ too, if it is not excluded specifically: - app.git_command('git clean -xfd --exclude thirdparty/tcc --exclude v --exclude v.exe --exclude cmd/tools/vup --exclude cmd/tools/vup.exe .') + app.git_command('git clean -xfd --exclude ./thirdparty/tcc --exclude ./v --exclude ./v.exe --exclude ./cmd/tools/vup --exclude ./cmd/tools/vup.exe .') } else { // pull latest app.git_command('git pull https://github.com/vlang/v master')