diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..24be71c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "GitScripts"] + path = GitScripts + url = git@github.com:sinbad/GitScripts.git diff --git a/GitScripts b/GitScripts new file mode 160000 index 0000000..6a88a95 --- /dev/null +++ b/GitScripts @@ -0,0 +1 @@ +Subproject commit 6a88a95ffd4ea6cb4f9eaa7b8f8dd33d23959b0b diff --git a/ue4-get-latest.ps1 b/ue4-get-latest.ps1 index ea2972c..3454df9 100644 --- a/ue4-get-latest.ps1 +++ b/ue4-get-latest.ps1 @@ -61,7 +61,8 @@ try { Write-Output "Changes present, would have run 'git stash push'" } else { 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) { Write-Output "ERROR: git stash push failed, aborting" exit 5