Merge remote-tracking branch 'origin/master' into more-codeclimate-cleanup

Author: unixorn

bin/git-find-dirty

@@ -4,14 +4,9 @@
 
 IFS=$'\n'
 
-fail() {
-  echo "$@"
-  exit 1
-}
-
 for gitprojpath in $(find . -type d -name .git | sort | sed "s/\/\.git//"); do
   pushd . > /dev/null
-  cd "$gitprojpath" || fail "could not cd to $gitprojpath"
+  cd "$gitprojpath" || continue
   isdirty=$(git status -s | grep "^.*")
   if [ -n "$isdirty" ]; then
     echo "DIRTY:" "$gitprojpath"

bin/git-git

@@ -9,5 +9,6 @@
 
 if [[ "$1" == 'git' ]]; then
   shift # chop off the extra git
+  # shellcheck disable=SC2068
   exec git $@
 fi

bin/git-overwritten

@@ -33,9 +33,9 @@ abort() {
 while [ "$#" -gt 0 ]; do
   case "$1" in
   --color ) colorize=1 ;;
-  --no-color ) colorize= ;;
+  --no-color ) colorize='';;
   --staged ) diff_type='--staged' ;;
-  --unstaged ) diff_type= ;;
+  --unstaged ) diff_type='';;
   -h | --help )
     sed -ne '/^#/!q;s/.\{1,2\}//;1d;p' < "$0"
     exit 0
@@ -127,4 +127,4 @@ git diff ${diff_type-"${base}...${head}"} --diff-filter=DM --no-prefix -w -U0 |
     printf ': '
     echo "$msg"
   done
-} | sort -r | uniq -c
+} | sort -r | uniq -c

bin/git-prune-branches

@@ -17,39 +17,39 @@
 merged=$(git branch --no-color --merged master | grep -v master | sed 's/\*/ /')
 
 if [ ! -z "$merged" ] ; then
-    echo "Deleting the following merged branches:"
-    for branch in $merged ; do
-        echo "    " "$branch"
-    done
+  echo "Deleting the following merged branches:"
+  for branch in $merged ; do
+    echo "    " "$branch"
+  done
 
-    all=n
+  all=n
+  delete=n
+  for branch in $merged ; do
+  if [ $all = 'n' ] ; then
     delete=n
-    for branch in $merged ; do
-    if [ $all = 'n' ] ; then
-        delete=n
-        # shellcheck disable=SC2162
-        read -p "Delete $branch (y=yes, n=no, a=all)? " prompt
-        echo "all=$all delete=$delete prompt=$prompt"
-        if [ "$prompt" = 'a' ] ; then
-            delete=y
-            all=y
-        elif [ "$prompt" = 'y' ]; then
-            delete=y
-        fi
+    # shellcheck disable=SC2162
+    read -p "Delete $branch (y=yes, n=no, a=all)? " prompt
+    echo "all=$all delete=$delete prompt=$prompt"
+    if [ "$prompt" = 'a' ] ; then
+      delete=y
+      all=y
+    elif [ "$prompt" = 'y' ]; then
+      delete=y
     fi
+  fi
 
-    if [ "$delete" = 'y' ] ; then
-        git branch -d "$branch"
-    fi
-    done
+  if [ "$delete" = 'y' ] ; then
+    git branch -d "$branch"
+  fi
+  done
 fi
 
 remotes=$(git remote)
 for remote in $remotes ; do
-    prompt=n
-    # shellcheck disable=SC2162
-    read -p "Prune deleted branches from remote '$remote' (y=yes n=no)? " prompt
-    if [ "$prompt" = 'y' ] ; then
-        git remote prune "$remote"
-    fi
+  prompt=n
+  # shellcheck disable=SC2162
+  read -p "Prune deleted branches from remote '$remote' (y=yes n=no)? " prompt
+  if [ "$prompt" = 'y' ] ; then
+    git remote prune "$remote"
+  fi
 done

bin/git-rel

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Original source: http://github.com/rtomayko/dotfiles
 # Usage: git-rel [<ref>]
 # Shows the relationship between the current branch and <ref>. With no <ref>,
@@ -13,7 +13,9 @@
 #   $ git-rel v1.1
 #     230 ahead
 
+# shellcheck disable=SC2046,SC2086
 strip_prefix () {
+    # shellcheck disable=SC2001
     echo "$@" |
     sed 's@refs/heads/@@'
 }
@@ -31,7 +33,7 @@ tracking_branch () {
 
 ref="${1:-$(tracking_branch)}"
 
-git rev-list --left-right --abbrev-commit --abbrev $ref...HEAD |
+git rev-list --left-right --abbrev-commit --abbrev "$ref"...HEAD |
 cut -c1         |
 sort            |
 uniq -c         |