X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=05e9be439f77518ec0b2321bc72c33af4df0dd5d;hb=6d7eda79ca3089742530def0456f22bf5846fc3a;hp=fb3013f445b44e2a17857131b8c84f5fc1646583;hpb=d580cd35b0af2d36dbb59e6287bc869b76c66dc3;p=feisty_meow.git diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index fb3013f4..05e9be43 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -139,11 +139,9 @@ test_or_die "changing dir to mapsdemo app" # gets rid of the old version of configs. git stash -if [ $? -eq 0 ]; then - # we actually stashed something, so deal with that. - git stash drop - test_or_die "dropping mapsdemo stash" -fi +test_or_die "stashing unwanted mapsdemo changes" +git stash drop +# intentionally ignore error, if there was nothing to drop. popd