Skip to content

Commit 285c6cb

Browse files
jonseymourgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5d2fc91 commit 285c6cb

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

generate-cmdlist.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ do
1515
sed -n '
1616
/^NAME/,/git-'"$cmd"'/H
1717
${
18-
x
19-
s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
18+
x
19+
s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
2020
p
2121
}' "Documentation/git-$cmd.txt"
2222
done

git-filter-branch.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
functions=$(cat << \EOF
1414
warn () {
15-
echo "$*" >&2
15+
echo "$*" >&2
1616
}
1717
1818
map()
@@ -98,11 +98,11 @@ set_ident () {
9898
}
9999

100100
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>...]"
106106

107107
OPTIONS_SPEC=
108108
. git-sh-setup

git-mergetool--lib.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ get_merge_tool_cmd () {
7979
fi
8080
if diff_mode; then
8181
echo "$(git config difftool.$merge_tool.cmd ||
82-
git config mergetool.$merge_tool.cmd)"
82+
git config mergetool.$merge_tool.cmd)"
8383
else
8484
echo "$(git config mergetool.$merge_tool.cmd)"
8585
fi
@@ -419,7 +419,7 @@ get_merge_tool_path () {
419419
fi
420420
if diff_mode; then
421421
merge_tool_path=$(git config difftool."$merge_tool".path ||
422-
git config mergetool."$merge_tool".path)
422+
git config mergetool."$merge_tool".path)
423423
else
424424
merge_tool_path=$(git config mergetool."$merge_tool".path)
425425
fi
@@ -429,7 +429,7 @@ get_merge_tool_path () {
429429
if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
430430
! type "$merge_tool_path" > /dev/null 2>&1; then
431431
echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
432-
"'$merge_tool_path'"
432+
"'$merge_tool_path'"
433433
exit 1
434434
fi
435435
echo "$merge_tool_path"

git-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ currently checked out branch is used.
2222
2323
Example: git-rebase master~1 topic
2424
25-
A---B---C topic A'\''--B'\''--C'\'' topic
25+
A---B---C topic A'\''--B'\''--C'\'' topic
2626
/ --> /
2727
D---E---F---G master D---E---F---G master
2828
'

0 commit comments

Comments
 (0)