Avoid magical --rebase (2.0.0)

sindresorhus/np#7
sindresorhus/np#8

CHANGELOG.md

@@ -1,5 +1,8 @@
+# 2.0.0 - 2016-01-11
 
+- Changed: do not rebase by default, but instead show a warning if relevant.
 - Fixed: no more ``*-trash`` warnings (``trash`` replaced by ``trash-cli``).
+- Added: show a warning if you have unstashed changes or remote is unreadable.
 
 # 1.0.0 - 2015-10-04
 

npmpublish.sh

@@ -1,5 +1,19 @@
 #!/usr/bin/env sh
-git pull --rebase &&
+
+if test -n "$(git status --porcelain)"; then
+  echo 'Unclean working tree. Commit or stash changes first.' >&2;
+  exit 128;
+fi
+
+if ! git fetch --quiet 2>/dev/null; then
+  echo 'There was a problem fetching your branch.' >&2;
+  exit 128;
+fi
+
+if test "0" != "$(git rev-list --count --left-only @'{u}'...HEAD)"; then
+  echo 'Remote history differ. Please pull changes.' >&2;
+  exit 128;
+fi
 
 # get the current real path of this file so we can relative node_modules
 # (in our case, trash-cli)

package.json

@@ -1,14 +1,17 @@
 {
   "name": "npmpub",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Another better `npm publish`",
   "keywords": [
     "cli-app",
     "cli",
     "npm",
     "publish",
     "git",
-    "push"
+    "push",
+    "version",
+    "bump",
+    "commit"
   ],
   "author": "Maxime Thirouin",
   "license": "MIT",