From 285c6cbf3c8eeadb6d4d4c3203888809e1cc7a81 Mon Sep 17 00:00:00 2001
From: Jon Seymour <jon.seymour@gmail.com>
Date: Fri, 5 Aug 2011 23:31:29 +1000
Subject: misc-sh: fix up whitespace in some other .sh files.

I found that the patched 4 files were different when this
filter is applied.

	expand -i | unexpand --first-only

This patch contains the corrected files.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-filter-branch.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'git-filter-branch.sh')

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 962a93b586..0d399aa880 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -12,7 +12,7 @@
 
 functions=$(cat << \EOF
 warn () {
-        echo "$*" >&2
+	echo "$*" >&2
 }
 
 map()
@@ -98,11 +98,11 @@ set_ident () {
 }
 
 USAGE="[--env-filter <command>] [--tree-filter <command>]
-            [--index-filter <command>] [--parent-filter <command>]
-            [--msg-filter <command>] [--commit-filter <command>]
-            [--tag-name-filter <command>] [--subdirectory-filter <directory>]
-            [--original <namespace>] [-d <directory>] [-f | --force]
-            [<rev-list options>...]"
+	    [--index-filter <command>] [--parent-filter <command>]
+	    [--msg-filter <command>] [--commit-filter <command>]
+	    [--tag-name-filter <command>] [--subdirectory-filter <directory>]
+	    [--original <namespace>] [-d <directory>] [-f | --force]
+	    [<rev-list options>...]"
 
 OPTIONS_SPEC=
 . git-sh-setup
-- 
cgit v1.2.3


From 9dcca58db42e85e056c6523429204f367a671a0e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Aug 2011 15:06:21 -0700
Subject: filter-branch.sh: de-dent usage string

"Usage: git filter-branch " that is prefixed to the first line is 25
columns long, so the "[--index-filter ..." on the second line would not
align with "[--env-filter ..." on the first line to begin with. If the
second and subsequent lines do not aim to align with anything on the
first line, it is just fine to indent them with a single HT.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-filter-branch.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'git-filter-branch.sh')

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 0d399aa880..71d072baaf 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -98,11 +98,11 @@ set_ident () {
 }
 
 USAGE="[--env-filter <command>] [--tree-filter <command>]
-	    [--index-filter <command>] [--parent-filter <command>]
-	    [--msg-filter <command>] [--commit-filter <command>]
-	    [--tag-name-filter <command>] [--subdirectory-filter <directory>]
-	    [--original <namespace>] [-d <directory>] [-f | --force]
-	    [<rev-list options>...]"
+	[--index-filter <command>] [--parent-filter <command>]
+	[--msg-filter <command>] [--commit-filter <command>]
+	[--tag-name-filter <command>] [--subdirectory-filter <directory>]
+	[--original <namespace>] [-d <directory>] [-f | --force]
+	[<rev-list options>...]"
 
 OPTIONS_SPEC=
 . git-sh-setup
-- 
cgit v1.2.3