undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc-sh: fix up whitespace in some other .sh files.

Browse Source 
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>
This commit is contained in:
Jon Seymour 2011-08-05 23:31:29 +10:00 committed by Junio C Hamano
parent 5d2fc9135a
commit 285c6cbf3c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
generate-cmdlist.sh
View File

@ -15,8 +15,8 @@ do
sed -n ' sed -n '
/^NAME/,/git-'"$cmd"'/H /^NAME/,/git-'"$cmd"'/H
${ ${
x x
s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/ s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
p p
}' "Documentation/git-$cmd.txt" }' "Documentation/git-$cmd.txt"
done done

12
git-filter-branch.sh
View File

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

6
git-mergetool--lib.sh
View File

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

2
git-rebase.sh
View File

@ -22,7 +22,7 @@ currently checked out branch is used.
Example: git-rebase master~1 topic 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 D---E---F---G master D---E---F---G master
' '