Subject: [PATCH 3/6] Remove whitespace breakage from *.sh files

From: Marco Costalba <[email-masked]>
Date: Sun, 20 May 2007 12:27:59 +0200

Using 'git apply --whitespace=strip'

Signed-off-by: Marco Costalba <[email-masked]>
---
  contrib/remotes2config.sh |    2 --
  git-applymbox.sh          |    4 ++--
  git-checkout.sh           |    4 ++--
  git-clone.sh              |    5 ++---
  git-commit.sh             |    2 +-
  git-merge-one-file.sh     |    2 +-
  git-tag.sh                |    5 ++---
  git-verify-tag.sh         |    1 -
  8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh
index dc09eae..0c8b954 100644
--- a/contrib/remotes2config.sh
+++ b/contrib/remotes2config.sh
@@ -31,5 +31,3 @@ if [ -d "$GIT_DIR"/remotes ]; then
  		esac
  	done
  fi
-
-
diff --git a/git-applymbox.sh b/git-applymbox.sh
index c18e80f..c51b2ff 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -69,7 +69,7 @@ set x .dotest/0*
  shift
  while case "$#" in 0) break;; esac
  do
-    i="$1"
+    i="$1"
      case "$resume,$continue" in
      f,$i)	resume=t;;
      f,*)	shift
@@ -94,7 +94,7 @@ do
  		;;
  	2)
  		# 2 is a special exit code from applypatch to indicate that
-	    	# the patch wasn't applied, but continue anyway
+		# the patch wasn't applied, but continue anyway
  		;;
  	*)
  		ret=$?
diff --git a/git-checkout.sh b/git-checkout.sh
index ed7c2c5..1ea4226 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -210,7 +210,7 @@ else
  	esac

  	# Match the index to the working tree, and do a three-way.
-    	git diff-files --name-only | git update-index --remove --stdin &&
+	git diff-files --name-only | git update-index --remove --stdin &&
  	work=`git write-tree` &&
  	git read-tree $v --reset -u $new || exit

@@ -245,7 +245,7 @@ else
      (exit $saved_err)
  fi

-#
+#
  # Switch the HEAD pointer to the new branch if we
  # checked out a branch head, and remove any potential
  # old MERGE_HEAD's (subsequent commits will clearly not
diff --git a/git-clone.sh b/git-clone.sh
index fdd354f..5bfd8d1 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -2,7 +2,7 @@
  #
  # Copyright (c) 2005, Linus Torvalds
  # Copyright (c) 2005, Junio C Hamano
-#
+#
  # Clone a repository into a different directory that does not yet exist.

  # See git-sh-setup why.
@@ -98,7 +98,7 @@ while
  	*,--na|*,--nak|*,--nake|*,--naked|\
  	*,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;
  	*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
-        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
+        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
            local_shared=yes; use_local=yes ;;
  	1,--template) usage ;;
  	*,--template)
@@ -410,4 +410,3 @@ fi
  rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"

  trap - 0
-
diff --git a/git-commit.sh b/git-commit.sh
index f28fc24..5b560f9 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -557,7 +557,7 @@ then
  	} >>"$GIT_DIR"/COMMIT_EDITMSG
  else
  	# we need to check if there is anything to commit
-	run_status >/dev/null
+	run_status >/dev/null
  fi
  if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
  then
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7d62d79..254d210 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -88,7 +88,7 @@ case "${1:-.}${2:-.}${3:-.}" in
  		# remove lines that are unique to ours.
  		orig=`git-unpack-file $2`
  		sz0=`wc -c <"$orig"`
-		diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
+		diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
  		sz1=`wc -c <"$orig"`

  		# If we do not have enough common material, it is not
diff --git a/git-tag.sh b/git-tag.sh
index 4a0a7b6..3f080bf 100755
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -36,7 +36,7 @@ do
  	exit $?
  	;;
      -m)
-    	annotate=1
+	annotate=1
  	shift
  	message="$1"
  	if test "$#" = "0"; then
@@ -62,7 +62,7 @@ do
  	username="$1"
  	;;
      -d)
-    	shift
+	shift
  	had_error=0
  	for tag
  	do
@@ -150,4 +150,3 @@ if [ "$annotate" ]; then
  fi

  git update-ref "refs/tags/$name" "$object" "$prev"
-
diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index 8db7dd0..f2d5597 100755
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
@@ -42,4 +42,3 @@ cat "$GIT_DIR/.tmp-vtag" |
  sed '/-----BEGIN PGP/Q' |
  gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
  rm -f "$GIT_DIR/.tmp-vtag"
-
-- 
1.5.2.rc3.90.gf33e-dirty