From: Chris Koeritz Date: Sat, 18 Nov 2017 01:43:44 +0000 (-0500) Subject: was ignoring error at wrong point X-Git-Tag: 2.140.101^2~10 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=6d7eda79ca3089742530def0456f22bf5846fc3a;p=feisty_meow.git was ignoring error at wrong point --- 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