'clean' with 'force'

Change-Id: I0707c907557629f5897646a2a01efdfd66f0726e

vendorsetup.sh

@@ -63,7 +63,7 @@ __abandon_branch()
   local FORCE="$2"
 
   if [[ -n "$(git branch --list b2g_autogen_ephemeral_branch)" ]]; then
-    if [[ "$FORCE" != "yes" && $(whoami) != "lnxbuild" ]]; then
+    if [[ "$FORCE" != "force" && $(whoami) != "lnxbuild" ]]; then
       if [[ -n $(git status --porcelain) ]]; then
          echo
          echo "ERROR: Uncommitted changes found in $branch/"
@@ -127,10 +127,10 @@ __patch_tree()
       fi
       FORCE=
       if [[ $1 == "force" ]]; then
-        FORCE=yes
+        FORCE=force
       fi
 
-      if [[ "$LASTMD5SUM" != "$MD5SUM" || "yes" == "$FORCE" ]]; then
+      if [[ "$LASTMD5SUM" != "$MD5SUM" || "force" == "$FORCE" ]]; then
 
          branch() {
             [[ -d $1 ]] || return 1
@@ -308,7 +308,7 @@ if [[ -z $1 ]]; then
    __patch_tree
 else
    case $1 in
-   clean) __abandon_tree ;;
+   clean) __abandon_tree force ;;
    force) __patch_tree force ;;
    np) echo "Skipping patch tree step...";;
    *) [[ -z "$PS1" ]] && __patch_tree || echo Error: Unknown command: $1