Add script for continuing difftool

Author: Nick Hwang

bin/difftool

@@ -30,32 +30,41 @@ function rename() {
     mv "$2" "$1"
 }
 
-# Add Airbnb git remote
-if [[ -z $(git remote -v | grep -e "$AIRBNB_REMOTE\s\+$AIRBNB_GIT\s\+(fetch)") ]]; then
-    git remote add "$AIRBNB_REMOTE" "$AIRBNB_GIT"
-fi
+function difftool() {
+    git difftool --prompt "$COMPARATE_BRANCH"
+}
 
-# Stash any existing changes before diffing
-git stash save "$STASH_MESSAGE"
+if [[ "$1" != "--continue" ]]; then
+    # Add Airbnb git remote
+    if [[ -z $(git remote -v | grep -e "$AIRBNB_REMOTE\s\+$AIRBNB_GIT\s\+(fetch)") ]]; then
+        git remote add "$AIRBNB_REMOTE" "$AIRBNB_GIT"
+    fi
 
-# Checkout working branch
-checkout "$WORKING_BRANCH"
+    # Stash any existing changes before diffing
+    git stash save "$STASH_MESSAGE"
 
-# Fetch Airbnb changes
-git fetch "$AIRBNB_REMOTE" "$REMOTE_BRANCH"
+    # Checkout working branch
+    checkout "$WORKING_BRANCH"
 
-# Checkout Airbnb remote branch
-checkout "$COMPARATE_BRANCH" "$AIRBNB_REMOTE/$REMOTE_BRANCH"
+    # Fetch Airbnb changes
+    git fetch "$AIRBNB_REMOTE" "$REMOTE_BRANCH"
 
-# Rename eslint-config-airbnb to eslint-config-hubspot for diffing
-rename "$ESLINT_HUBSPOT" "$ESLINT_AIRBNB"
+    # Checkout Airbnb remote branch
+    checkout "$COMPARATE_BRANCH" "$AIRBNB_REMOTE/$REMOTE_BRANCH"
 
-# Commit rename for diffing
-git add "$ESLINT_AIRBNB" "$ESLINT_HUBSPOT"
-git commit -m "$COMMIT_MESSAGE"
+    # Rename eslint-config-airbnb to eslint-config-hubspot for diffing
+    rename "$ESLINT_HUBSPOT" "$ESLINT_AIRBNB"
 
-# Checkout last branch to begin diffing
-git checkout "$WORKING_BRANCH"
+    # Commit rename for diffing
+    git add "$ESLINT_AIRBNB" "$ESLINT_HUBSPOT"
+    git commit -m "$COMMIT_MESSAGE"
 
-# Begin diffing
-git difftool --prompt "$COMPARATE_BRANCH"
+    # Checkout last branch to begin diffing
+    git checkout "$WORKING_BRANCH"
+
+    # Begin diffing
+    difftool
+else
+    # Continue difftool
+    difftool
+fi

package.json

@@ -4,7 +4,8 @@
   "description": "HubSpot's version of a mostly reasonable approach to JavaScript",
   "scripts": {
     "difftool": "./bin/difftool",
-    "cleanup": "./bin/cleanup",
+    "difftool:continue": "./bin/difftool --continue",
+    "difftool:cleanup": "./bin/cleanup",
     "publish:config": "cd packages/eslint-config-hubspot && npm publish",
     "publish:all": "npm publish && npm run publish:config"
   },