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>

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 3ef4861d04ed5fed14d31b92e047a03cf5362970..1093ef4ad6b9793fb829403c41391a09a07e57a2 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -15,8 +15,8 @@ do
      sed -n '
      /^NAME/,/git-'"$cmd"'/H
      ${
-            x
-            s/.*git-'"$cmd"' - \(.*\)/  {"'"$cmd"'", "\1"},/
+           x
+           s/.*git-'"$cmd"' - \(.*\)/  {"'"$cmd"'", "\1"},/
            p
      }' "Documentation/git-$cmd.txt"
 done

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 962a93b586571eb6fc60aae53c77f6e6b9fb281f..0d399aa8809feaef4682411b72ba99c1cacf2080 100755 (executable)
--- 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

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 91f90acfba2a710644f4a076d27d50e0fbb33c2d..9a89e8f31981a0c82cf25ab6c75a6f841c7ba79b 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -79,7 +79,7 @@ get_merge_tool_cmd () {
        fi
        if diff_mode; then
                echo "$(git config difftool.$merge_tool.cmd ||
-                       git config mergetool.$merge_tool.cmd)"
+                       git config mergetool.$merge_tool.cmd)"
        else
                echo "$(git config mergetool.$merge_tool.cmd)"
        fi
@@ -419,7 +419,7 @@ get_merge_tool_path () {
        fi
        if diff_mode; then
                merge_tool_path=$(git config difftool."$merge_tool".path ||
-                                 git config mergetool."$merge_tool".path)
+                                 git config mergetool."$merge_tool".path)
        else
                merge_tool_path=$(git config mergetool."$merge_tool".path)
        fi
@@ -429,7 +429,7 @@ get_merge_tool_path () {
        if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
        ! type "$merge_tool_path" > /dev/null 2>&1; then
                echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
-                        "'$merge_tool_path'"
+                        "'$merge_tool_path'"
                exit 1
        fi
        echo "$merge_tool_path"

diff --git a/git-rebase.sh b/git-rebase.sh
index 266a4c13bb3607ad635df19bf6dd80f205effae2..6759702c573f51ac00bf1b5c8abccf252cb4ff1d 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -22,7 +22,7 @@ currently checked out branch is used.
 
 Example:       git-rebase master~1 topic
 
-        A---B---C topic                   A'\''--B'\''--C'\'' topic
+       A---B---C topic                   A'\''--B'\''--C'\'' topic
        /                   -->           /
   D---E---F---G master          D---E---F---G master
 '