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>
Jon Seymour committed
Aug 5, 2011 at 23:31 UTC
285c6cbf3c8eeadb6d4d4c3203888809e1cc7a81
4 files changed
+12
-12
generate-cmdlist.sh
+2
-2
@@ -15,8 +15,8 @@ do
15
sed -n '
16
/^NAME/,/git-'"$cmd"'/H
17
${
18
- x
19
- s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
18
+ x
19
+ s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
20
p
21
}' "Documentation/git-$cmd.txt"
22
done
git-filter-branch.sh
+6
-6
@@ -12,7 +12,7 @@
12
13
functions=$(cat << \EOF
14
warn () {
15
- echo "$*" >&2
15
+ echo "$*" >&2
16
}
17
18
map()
@@ -98,11 +98,11 @@ set_ident () {
98
}
99
100
USAGE="[--env-filter <command>] [--tree-filter <command>]
101
- [--index-filter <command>] [--parent-filter <command>]
102
- [--msg-filter <command>] [--commit-filter <command>]
103
- [--tag-name-filter <command>] [--subdirectory-filter <directory>]
104
- [--original <namespace>] [-d <directory>] [-f | --force]
105
- [<rev-list options>...]"
101
+ [--index-filter <command>] [--parent-filter <command>]
102
+ [--msg-filter <command>] [--commit-filter <command>]
103
+ [--tag-name-filter <command>] [--subdirectory-filter <directory>]
104
+ [--original <namespace>] [-d <directory>] [-f | --force]
105
+ [<rev-list options>...]"
106
107
OPTIONS_SPEC=
108
. git-sh-setup
git-mergetool--lib.sh
+3
-3
@@ -79,7 +79,7 @@ get_merge_tool_cmd () {
79
fi
80
if diff_mode; then
81
echo "$(git config difftool.$merge_tool.cmd ||
82
- git config mergetool.$merge_tool.cmd)"
82
+ git config mergetool.$merge_tool.cmd)"
83
else
84
echo "$(git config mergetool.$merge_tool.cmd)"
85
fi
@@ -419,7 +419,7 @@ get_merge_tool_path () {
419
fi
420
if diff_mode; then
421
merge_tool_path=$(git config difftool."$merge_tool".path ||
422
- git config mergetool."$merge_tool".path)
422
+ git config mergetool."$merge_tool".path)
423
else
424
merge_tool_path=$(git config mergetool."$merge_tool".path)
425
fi
@@ -429,7 +429,7 @@ get_merge_tool_path () {
429
if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
430
! type "$merge_tool_path" > /dev/null 2>&1; then
431
echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
432
- "'$merge_tool_path'"
432
+ "'$merge_tool_path'"
433
exit 1
434
fi
435
echo "$merge_tool_path"
git-rebase.sh
+1
-1
@@ -22,7 +22,7 @@ currently checked out branch is used.
22
23
Example: git-rebase master~1 topic
24
25
- A---B---C topic A'\''--B'\''--C'\'' topic
25
+ A---B---C topic A'\''--B'\''--C'\'' topic
26
/ --> /
27
D---E---F---G master D---E---F---G master
28
'