{"thread":{"id":"8237","subject":"[PATCH 3/6] Remove whitespace breakage from *.sh files","startedAt":"2007-05-20T10:27:59Z","lastAt":"2007-05-20T10:27:59Z","messageCount":1,"participants":["Marco Costalba"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"42691","messageId":"465022AF.1090905@gmail.com","threadId":"8237","inReplyTo":null,"subject":"[PATCH 3/6] Remove whitespace breakage from *.sh files","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2007-05-20T10:27:59Z","receivedAt":"2007-05-20T10:27:59Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Using 'git apply --whitespace=strip'\n\nSigned-off-by: Marco Costalba <mcostalba@gmail.com>\n---\n  contrib/remotes2config.sh |    2 --\n  git-applymbox.sh          |    4 ++--\n  git-checkout.sh           |    4 ++--\n  git-clone.sh              |    5 ++---\n  git-commit.sh             |    2 +-\n  git-merge-one-file.sh     |    2 +-\n  git-tag.sh                |    5 ++---\n  git-verify-tag.sh         |    1 -\n  8 files changed, 10 insertions(+), 15 deletions(-)\n\ndiff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh\nindex dc09eae..0c8b954 100644\n--- a/contrib/remotes2config.sh\n+++ b/contrib/remotes2config.sh\n@@ -31,5 +31,3 @@ if [ -d \"$GIT_DIR\"/remotes ]; then\n  \t\tesac\n  \tdone\n  fi\n-\n-\ndiff --git a/git-applymbox.sh b/git-applymbox.sh\nindex c18e80f..c51b2ff 100755\n--- a/git-applymbox.sh\n+++ b/git-applymbox.sh\n@@ -69,7 +69,7 @@ set x .dotest/0*\n  shift\n  while case \"$#\" in 0) break;; esac\n  do\n-    i=\"$1\"\n+    i=\"$1\"\n      case \"$resume,$continue\" in\n      f,$i)\tresume=t;;\n      f,*)\tshift\n@@ -94,7 +94,7 @@ do\n  \t\t;;\n  \t2)\n  \t\t# 2 is a special exit code from applypatch to indicate that\n-\t    \t# the patch wasn't applied, but continue anyway\n+\t\t# the patch wasn't applied, but continue anyway\n  \t\t;;\n  \t*)\n  \t\tret=$?\ndiff --git a/git-checkout.sh b/git-checkout.sh\nindex ed7c2c5..1ea4226 100755\n--- a/git-checkout.sh\n+++ b/git-checkout.sh\n@@ -210,7 +210,7 @@ else\n  \tesac\n\n  \t# Match the index to the working tree, and do a three-way.\n-    \tgit diff-files --name-only | git update-index --remove --stdin &&\n+\tgit diff-files --name-only | git update-index --remove --stdin &&\n  \twork=`git write-tree` &&\n  \tgit read-tree $v --reset -u $new || exit\n\n@@ -245,7 +245,7 @@ else\n      (exit $saved_err)\n  fi\n\n-#\n+#\n  # Switch the HEAD pointer to the new branch if we\n  # checked out a branch head, and remove any potential\n  # old MERGE_HEAD's (subsequent commits will clearly not\ndiff --git a/git-clone.sh b/git-clone.sh\nindex fdd354f..5bfd8d1 100755\n--- a/git-clone.sh\n+++ b/git-clone.sh\n@@ -2,7 +2,7 @@\n  #\n  # Copyright (c) 2005, Linus Torvalds\n  # Copyright (c) 2005, Junio C Hamano\n-#\n+#\n  # Clone a repository into a different directory that does not yet exist.\n\n  # See git-sh-setup why.\n@@ -98,7 +98,7 @@ while\n  \t*,--na|*,--nak|*,--nake|*,--naked|\\\n  \t*,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;\n  \t*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;\n-        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)\n+        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)\n            local_shared=yes; use_local=yes ;;\n  \t1,--template) usage ;;\n  \t*,--template)\n@@ -410,4 +410,3 @@ fi\n  rm -f \"$GIT_DIR/CLONE_HEAD\" \"$GIT_DIR/REMOTE_HEAD\"\n\n  trap - 0\n-\ndiff --git a/git-commit.sh b/git-commit.sh\nindex f28fc24..5b560f9 100755\n--- a/git-commit.sh\n+++ b/git-commit.sh\n@@ -557,7 +557,7 @@ then\n  \t} >>\"$GIT_DIR\"/COMMIT_EDITMSG\n  else\n  \t# we need to check if there is anything to commit\n-\trun_status >/dev/null\n+\trun_status >/dev/null\n  fi\n  if [ \"$?\" != \"0\" -a ! -f \"$GIT_DIR/MERGE_HEAD\" -a -z \"$amend\" ]\n  then\ndiff --git a/git-merge-one-file.sh b/git-merge-one-file.sh\nindex 7d62d79..254d210 100755\n--- a/git-merge-one-file.sh\n+++ b/git-merge-one-file.sh\n@@ -88,7 +88,7 @@ case \"${1:-.}${2:-.}${3:-.}\" in\n  \t\t# remove lines that are unique to ours.\n  \t\torig=`git-unpack-file $2`\n  \t\tsz0=`wc -c <\"$orig\"`\n-\t\tdiff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add\n+\t\tdiff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add\n  \t\tsz1=`wc -c <\"$orig\"`\n\n  \t\t# If we do not have enough common material, it is not\ndiff --git a/git-tag.sh b/git-tag.sh\nindex 4a0a7b6..3f080bf 100755\n--- a/git-tag.sh\n+++ b/git-tag.sh\n@@ -36,7 +36,7 @@ do\n  \texit $?\n  \t;;\n      -m)\n-    \tannotate=1\n+\tannotate=1\n  \tshift\n  \tmessage=\"$1\"\n  \tif test \"$#\" = \"0\"; then\n@@ -62,7 +62,7 @@ do\n  \tusername=\"$1\"\n  \t;;\n      -d)\n-    \tshift\n+\tshift\n  \thad_error=0\n  \tfor tag\n  \tdo\n@@ -150,4 +150,3 @@ if [ \"$annotate\" ]; then\n  fi\n\n  git update-ref \"refs/tags/$name\" \"$object\" \"$prev\"\n-\ndiff --git a/git-verify-tag.sh b/git-verify-tag.sh\nindex 8db7dd0..f2d5597 100755\n--- a/git-verify-tag.sh\n+++ b/git-verify-tag.sh\n@@ -42,4 +42,3 @@ cat \"$GIT_DIR/.tmp-vtag\" |\n  sed '/-----BEGIN PGP/Q' |\n  gpg --verify \"$GIT_DIR/.tmp-vtag\" - || exit 1\n  rm -f \"$GIT_DIR/.tmp-vtag\"\n-\n-- \n1.5.2.rc3.90.gf33e-dirty\n"}]}