From: Chris Koeritz Date: Sat, 18 Nov 2017 01:40:15 +0000 (-0500) Subject: catching stash fail on no changes now X-Git-Tag: 2.140.101^2~12 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b9133738e6543013d367f92c9c95bab837b4713b;p=feisty_meow.git catching stash fail on no changes now --- 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