diff --git a/Scripts/clean-branch.ps1 b/Scripts/clean-branch.ps1 index 3a446d9b..ff4cc230 100755 --- a/Scripts/clean-branch.ps1 +++ b/Scripts/clean-branch.ps1 @@ -1,7 +1,7 @@ #!/bin/powershell <# .SYNTAX ./clean-branch.ps1 [] -.DESCRIPTION cleans the current/given Git repository from generated files (including submodules, e.g. for a fresh build) +.DESCRIPTION cleans the current/given Git repository from untracked files (including submodules, e.g. for a fresh build) .LINK https://github.com/fleschutz/PowerShell .NOTES Author: Markus Fleschutz / License: CC0 #> @@ -9,18 +9,14 @@ param($RepoDir = "$PWD") try { - & git --version -} catch { - write-error "ERROR: can't execute 'git' - make sure Git is installed and available" - exit 1 -} - -try { - write-progress "Cleaning Git repository $RepoDir from generated files ..." + "Cleaning Git repository $RepoDir from untracked files ..." if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" } set-location "$RepoDir" + & git --version + if ($lastExitCode -ne "0") { throw "Can't execute 'git' - make sure Git is installed and available" } + & git clean -fdx # force + recurse into dirs + don't use the standard ignore rules if ($lastExitCode -ne "0") { throw "'git clean -fdx' failed" }