From 10c136fc67db8e404960bf98c1d9fc2a8acaef53 Mon Sep 17 00:00:00 2001 From: Steve Streeting Date: Thu, 6 Aug 2020 17:13:15 +0100 Subject: [PATCH] Go back to standard stash, is safe after all --- GitScripts | 2 +- ue4-get-latest.ps1 | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/GitScripts b/GitScripts index 6a88a95..314d74f 160000 --- a/GitScripts +++ b/GitScripts @@ -1 +1 @@ -Subproject commit 6a88a95ffd4ea6cb4f9eaa7b8f8dd33d23959b0b +Subproject commit 314d74f405b52327e2c7120312b69768dcc399fc diff --git a/ue4-get-latest.ps1 b/ue4-get-latest.ps1 index 3454df9..ea2972c 100644 --- a/ue4-get-latest.ps1 +++ b/ue4-get-latest.ps1 @@ -61,8 +61,7 @@ try { Write-Output "Changes present, would have run 'git stash push'" } else { Write-Output "Working copy has changes, saving them in stash" - # Use our "LFS safe" - &"$PSScriptRoot/GitScripts/git-lfs-safe-stash.ps1" push -q -m "Saved changes during Get Latest" + git stash push -q -m "Saved changes during Get Latest" if ($LASTEXITCODE -ne 0) { Write-Output "ERROR: git stash push failed, aborting" exit 5