From b9133738e6543013d367f92c9c95bab837b4713b Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 17 Nov 2017 20:40:15 -0500 Subject: [PATCH] catching stash fail on no changes now --- scripts/site_avenger/revamp_cakelampvm.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 3cf7db37..1d02bcb9 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -132,9 +132,11 @@ test_or_die "changing dir to mapsdemo app" # gets rid of the old version of configs. git stash -test_or_die "stashing mapsdemo changes" -git stash drop -test_or_die "dropping mapsdemo stash" +if [ $? -eq 0 ]; then + # we actually stashed something, so deal with that. + git stash drop + test_or_die "dropping mapsdemo stash" +fi popd -- 2.34.1