unwip : fix

1 files changed, 6 insertions, 1 deletions

diff --git a/unwip b/unwip
index 5220208..29ccf83 100755
--- a/unwip
+++ b/unwip
@@ -11,7 +11,12 @@ then
     do
         git reset --hard HEAD~1
     done
-    git pull && git reset --soft HEAD~1 && git reset && git status
+    git pull || exit 1
+    while [ "$(git log --format="%s" HEAD~1..)" == "WIP" ]
+    do
+        git reset --soft HEAD~1
+    done
+    git reset && git status
 else
     echo "unknown cmd '$cmd'" && exit 1
 fi