From 6d7eda79ca3089742530def0456f22bf5846fc3a Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 17 Nov 2017 20:43:44 -0500 Subject: [PATCH] was ignoring error at wrong point --- scripts/site_avenger/revamp_cakelampvm.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 -- 2.34.1