catching stash fail on no changes now

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 3cf7db3702c50671fdda90f514e624405b937b4f..1d02bcb9560e5927af8b5a1d060fb2cb0f192bde 100644 (file)
--- 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