Merge pull request #50 from unixorn/more-codeclimate-cleanup

More codeclimate cleanup

Author: unixorn

README.md

@@ -1,5 +1,11 @@
 # git-extra-commands
 
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Build Status](https://travis-ci.org/unixorn/git-extra-commands.svg?branch=master)](https://travis-ci.org/unixorn/git-extra-commands)
+[![Code Climate](https://codeclimate.com/github/unixorn/git-extra-commands/badges/gpa.svg)](https://codeclimate.com/github/unixorn/git-extra-commands)
+[![Issue Count](https://codeclimate.com/github/unixorn/git-extra-commands/badges/issue_count.svg)](https://codeclimate.com/github/unixorn/git-extra-commands)
+[![GitHub stars](https://img.shields.io/github/stars/unixorn/bigriver-tools.svg)](https://github.com/unixorn/bigriver-tools/stargazers)
+
 A zsh plugin that packages some extra git helper scripts I've found. I only wrote a few of these scripts, and the ones I didn't each have whatever licensing is included in the file.
 
 This collection doesn't actually require zsh, but packaging it as a ZSH plugin makes it more convenient for people using a ZSH framework to use this collection.

bin/git-changes

@@ -2,4 +2,4 @@
 #
 # https://github.com/cofi/dotfiles/blob/master/bin
 
-git log --pretty=format:'%an <%ae>' $1 | sort | uniq -c | sort -nr
+exec git log --pretty=format:'%an <%ae>' "$1" | sort | uniq -c | sort -nr

bin/git-clone-subset

@@ -147,4 +147,4 @@ if [[ -e .git/refs/original/ ]] ; then
 	git "for-each-ref" --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d
 fi &&
 git reflog expire --expire=now --all &&
-git gc --prune=now
+git gc --prune=now

bin/git-delete-local-merged

@@ -5,4 +5,5 @@
 #
 #   https://plus.google.com/115587336092124934674/posts/dXsagsvLakJ
 
-git branch -d `git branch --merged | grep -v '^*' | tr -d '\n'`
+# shellcheck disable=SC2046,SC2063
+exec git branch -d $(git branch --merged | grep -v '^*' | tr -d '\n')

bin/git-delete-merged-branches

@@ -15,4 +15,4 @@ if [[ "${currentBranch}" != "${mergedInto}" ]]; then
   exit 1
 fi
 
-git branch --merged ${mergedInto} | grep -v "\* ${mergedInto}" | xargs -n 1 git branch -d
+git branch --merged "${mergedInto}" | grep -v "\* ${mergedInto}" | xargs -n 1 git branch -d

bin/git-move-commits

@@ -12,6 +12,7 @@ set -e
 
 if [ "$1" ]
 then
+    # shellcheck disable=SC2046,SC2143
     if [ ! $(echo "$1" | grep -E "^[0-9]+$") ]
     then
         echo "$1 is not a number."
@@ -27,25 +28,27 @@ else
     echo "Usage: git move-commits <num-commits> <correct-branch>";
     exit 1;
 fi
-if [ -z $2 ]
+if [ -z "$2" ]
 then
     echo "Usage: git move-commits <num-commits> <correct-branch>";
     exit 1;
 else
-    BRANCH=$2
+    BRANCH="$2"
 fi
 
-CURRENT_BRANCH=`git branch | grep '*' | perl -e '<STDIN> =~ /^..(.+)$/;print $1'`
+# shellcheck disable=SC2063
+CURRENT_BRANCH=$(git branch | grep '*' | perl -e '<STDIN> =~ /^..(.+)$/;print $1')
 
 # If the branch already exists, we have to merge it with the current branch
-if ! [ -z `git branch -a | grep $BRANCH` ]
+# shellcheck disable=SC2143,SC2046
+if ! [ -z $(git branch -a | grep "$BRANCH") ]
 then
     echo "$BRANCH already exists. Switching to it and merging $CURRENT_BRANCH"
-    git checkout $BRANCH
-    git merge $CURRENT_BRANCH
+    git checkout "$BRANCH"
+    git merge "$CURRENT_BRANCH"
 else
     echo "Creating $BRANCH"
-    git branch $BRANCH
+    git branch "$BRANCH"
 fi
-git reset --hard $CURRENT_BRANCH~$NUM_COMMITS
-git checkout $BRANCH
+git reset --hard "$CURRENT_BRANCH~$NUM_COMMITS"
+git checkout "$BRANCH"

bin/git-rebase-theirs

@@ -24,6 +24,7 @@ inplace=0
 ext=".bak"
 
 message() { printf "%s\n" "$1" >&2 ; }
+# shellcheck disable=SC2104
 skip()    { message "skipping ${2:-$file}${1:+: $1}"; continue ; }
 argerr()  { printf "%s: %s\n" "$myname" "${1:-error}" >&2 ; usage 1 ; }
 invalid() { argerr "invalid option: $1" ; }
@@ -102,6 +103,7 @@ for file in "${files[@]}"; do
 
 	if ((inplace)); then
 		outfile=$(mktemp) || skip "could not create temporary file"
+		# shellcheck disable=SC2064
 		trap "rm -f -- '$outfile'" EXIT
 		cp "$file" "$outfile" || skip
 		exec 3>"$outfile"
@@ -125,4 +127,4 @@ for file in "${files[@]}"; do
 	trap - EXIT
 
 	if ((verbose)); then message "resolved ${file}"; fi
-done
+done