Using git-lfs-safe-stash script (added my git scripts submodule)

This commit is contained in:
Steve Streeting 2020-08-06 15:57:17 +01:00
parent 6f604ab3e4
commit 537c4e0618
3 changed files with 6 additions and 1 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "GitScripts"]
path = GitScripts
url = git@github.com:sinbad/GitScripts.git

1
GitScripts Submodule

@ -0,0 +1 @@
Subproject commit 6a88a95ffd4ea6cb4f9eaa7b8f8dd33d23959b0b

View File

@ -61,7 +61,8 @@ try {
Write-Output "Changes present, would have run 'git stash push'" Write-Output "Changes present, would have run 'git stash push'"
} else { } else {
Write-Output "Working copy has changes, saving them in stash" Write-Output "Working copy has changes, saving them in stash"
git stash push -q -m "Saved changes during Get Latest" # Use our "LFS safe"
&"$PSScriptRoot/GitScripts/git-lfs-safe-stash.ps1" push -q -m "Saved changes during Get Latest"
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
Write-Output "ERROR: git stash push failed, aborting" Write-Output "ERROR: git stash push failed, aborting"
exit 5 exit 5