Merge branch 'master' into fix-deprecations

Author: hyperupcall

git-apply-url

@@ -31,12 +31,12 @@
 
 URL=$1
 
-function error {
+error() {
   echo $*
   exit 1
 }
 
-if [[ ! $URL ]]; then
+if [ ! $URL ]; then
   error $0 URL
 fi
 

git-clone.sh

@@ -19,7 +19,7 @@ function clone {
   $GIT clone -q $1 $2
   res=$?
 
-  cd $2
+  cd "$2"
 
   $GIT pull --all
 
@@ -29,4 +29,4 @@ function clone {
 }
 
 echo "cloning repository into ... $2"
-clone $1 $2
+clone $1 "$2"

git-closest-match

@@ -13,13 +13,14 @@ fi
 
 commit=$(for i in $all; do
 	echo -n "$i "
+	printf '%s\n' "$i "
 	# why is there no git diff --shortnumstat ?
 	git diff -M $spec $i | wc -l
 done | sort -k 2 -n | head -n 1 | cut -f 1 -d ' ')
 if [ "$mode" = diff ]; then
 	git log --no-walk $commit | cat -
 	git diff -M $spec $commit | cat -
 else
-	echo -n "$commit: "
+	printf '%s\n' "$commit: "
 	 git diff -M $spec $commit | wc -l
 fi

git-filemerge

@@ -11,16 +11,16 @@ OLD="$1"; shift
 fi
 test $# -gt 0 && test -z "$CACHED" && NEW="$1"
 TMPDIR1=$(mktemp -d)
-git archive --format=tar $OLD | (cd $TMPDIR1; tar xf -)
+git archive --format=tar $OLD | (cd "$TMPDIR1"; tar xf -)
 if test -z "$NEW"; then
 TMPDIR2=$(git rev-parse --show-cdup)
 test -z "$cdup" && TMPDIR2=.
 else
 TMPDIR2=$(mktemp -d)
-  git archive --format=tar $NEW | (cd $TMPDIR2; tar xf -)
+  git archive --format=tar $NEW | (cd "$TMPDIR2"; tar xf -)
 fi
 
-opendiff $TMPDIR1 $TMPDIR2 | cat
-rm -rf $TMPDIR1
-test ! -z "$NEW" && rm -rf $TMPDIR2
+opendiff "$TMPDIR1" "$TMPDIR2" | cat
+rm -rf "$TMPDIR1"
+test ! -z "$NEW" && rm -rf "$TMPDIR2"
 

git-find-children

@@ -7,5 +7,6 @@ fi
 for ref in "$@"; do
     for sha1 in $(git rev-list "$@")
     do
+        :
     done
 done

git-find-useful-dangling-trees

@@ -1,5 +1,5 @@
 #!/bin/bash
-depth={1:-all} # 'all' or number of depth
+depth=${1:-all} # 'all' or number of depth
 
 for i in $(git fsck --unreachable | grep -E 'tree|commit' | cut -d\  -f3)
 do

git-fire-subtree/git-fire

@@ -71,7 +71,6 @@ display_help() {
     -h, --help                      Display this help information
 
 EOF
-	exit 0
 }
 
 

git-remote-in-sync.sh

@@ -18,10 +18,10 @@ ret=0
 
 if [ -z "$(git branch)" ]
 then
-	if [ $(cd $(git root) && ls -Al | egrep -v "^(.git|total)" | wc -l) -gt 0 ]
+	if [ $(cd "$(git root)" && ls -Al | egrep -v "^(.git|total)" | wc -l) -gt 0 ]
 	then
 		echo "WARN: This repo doesn't contain any branch, but contains a bunch of files!" >&2
-		ls -Alh $(git root)
+		ls -Alh "$(git root)"
 		ret=1
 	else
 		echo "INFO: This repo doesn't contain any branch, and is empty"

git-root

@@ -6,9 +6,9 @@ if [ -n "$1" ]
 then
 	if [ -d "$1" ]
 	then
-		cd $1
+		cd "$1"
 	else
-		cd $(dirname $1)
+		cd "$(dirname "$1")"
 	fi
 fi
 exec git rev-parse --show-toplevel

git-save-home

@@ -15,7 +15,7 @@
 
 MODIFIED=$(git status | grep modified | cut -d " " -f 3-)
 
-if [ "x$MODIFIED" == x ]; then
+if [ -n "$MODIFIED" ]; then
   echo no changes
 else
   git add -f $MODIFIED \