{"thread":{"id":"28027","subject":"[PATCH] misc-sh: fix up whitespace in some other .sh files.","startedAt":"2011-08-05T13:31:29Z","lastAt":"2011-08-06T03:33:48Z","messageCount":3,"participants":["Jon Seymour","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"172975","messageId":"1312551089-3753-1-git-send-email-jon.seymour@gmail.com","threadId":"28027","inReplyTo":null,"subject":"[PATCH] misc-sh: fix up whitespace in some other .sh files.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2011-08-05T13:31:29Z","receivedAt":"2011-08-05T13:31:29Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"I found that the patched 4 files were different when this\nfilter is applied.\n\n\texpand -i | unexpand --first-only\n\nThis patch contains the corrected files.\n\nSigned-off-by: Jon Seymour \n---\n generate-cmdlist.sh | 4 ++--\n git-filter-branch.sh | 12 ++++++------\n git-mergetool--lib.sh | 6 +++---\n git-rebase.sh | 2 +-\n 4 files changed, 12 insertions(+), 12 deletions(-)\n\ndiff --git a/generate-cmdlist.sh b/generate-cmdlist.sh\nindex 3ef4861..1093ef4 100755\n--- a/generate-cmdlist.sh\n+++ b/generate-cmdlist.sh\n@@ -15,8 +15,8 @@ do\n sed -n '\n /^NAME/,/git-'\"$cmd\"'/H\n ${\n- x\n- s/.*git-'\"$cmd\"' - \\(.*\\)/ {\"'\"$cmd\"'\", \"\\1\"},/\n+\t x\n+\t s/.*git-'\"$cmd\"' - \\(.*\\)/ {\"'\"$cmd\"'\", \"\\1\"},/\n \t p\n }' \"Documentation/git-$cmd.txt\"\n done\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex 962a93b..0d399aa 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -12,7 +12,7 @@\n \n functions=$(cat << \\EOF\n warn () {\n- echo \"$*\" >&2\n+\techo \"$*\" >&2\n }\n \n map()\n@@ -98,11 +98,11 @@ set_ident () {\n }\n \n USAGE=\"[--env-filter ] [--tree-filter ]\n- [--index-filter ] [--parent-filter ]\n- [--msg-filter ] [--commit-filter ]\n- [--tag-name-filter ] [--subdirectory-filter ]\n- [--original ] [-d ] [-f | --force]\n- [...]\"\n+\t [--index-filter ] [--parent-filter ]\n+\t [--msg-filter ] [--commit-filter ]\n+\t [--tag-name-filter ] [--subdirectory-filter ]\n+\t [--original ] [-d ] [-f | --force]\n+\t [...]\"\n \n OPTIONS_SPEC=\n . git-sh-setup\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex 91f90ac..9a89e8f 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -79,7 +79,7 @@ get_merge_tool_cmd () {\n \tfi\n \tif diff_mode; then\n \t\techo \"$(git config difftool.$merge_tool.cmd ||\n-\t\t git config mergetool.$merge_tool.cmd)\"\n+\t\t\tgit config mergetool.$merge_tool.cmd)\"\n \telse\n \t\techo \"$(git config mergetool.$merge_tool.cmd)\"\n \tfi\n@@ -419,7 +419,7 @@ get_merge_tool_path () {\n \tfi\n \tif diff_mode; then\n \t\tmerge_tool_path=$(git config difftool.\"$merge_tool\".path ||\n-\t\t git config mergetool.\"$merge_tool\".path)\n+\t\t\t\t git config mergetool.\"$merge_tool\".path)\n \telse\n \t\tmerge_tool_path=$(git config mergetool.\"$merge_tool\".path)\n \tfi\n@@ -429,7 +429,7 @@ get_merge_tool_path () {\n \tif test -z \"$(get_merge_tool_cmd \"$merge_tool\")\" &&\n \t! type \"$merge_tool_path\" > /dev/null 2>&1; then\n \t\techo >&2 \"The $TOOL_MODE tool $merge_tool is not available as\"\\\n-\t\t \"'$merge_tool_path'\"\n+\t\t\t \"'$merge_tool_path'\"\n \t\texit 1\n \tfi\n \techo \"$merge_tool_path\"\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 266a4c1..6759702 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -22,7 +22,7 @@ currently checked out branch is used.\n \n Example: git-rebase master~1 topic\n \n- A---B---C topic A'\\''--B'\\''--C'\\'' topic\n+\tA---B---C topic A'\\''--B'\\''--C'\\'' topic\n / --> /\n D---E---F---G master D---E---F---G master\n '\n-- \n1.7.6.360.geebb0f\n"},{"id":"172986","messageId":"7vmxfn3h2v.fsf@alter.siamese.dyndns.org","threadId":"28027","inReplyTo":"1312551089-3753-1-git-send-email-jon.seymour@gmail.com","subject":"Re: [PATCH] misc-sh: fix up whitespace in some other .sh files.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-08-05T17:26:32Z","receivedAt":"2011-08-05T17:26:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jon Seymour writes:\n\n> diff --git a/git-filter-branch.sh b/git-filter-branch.sh\n> index 962a93b..0d399aa 100755\n> --- a/git-filter-branch.sh\n> +++ b/git-filter-branch.sh\n> @@ -98,11 +98,11 @@ set_ident () {\n> }\n> \n> USAGE=\"[--env-filter ] [--tree-filter ]\n> - [--index-filter ] [--parent-filter ]\n> - [--msg-filter ] [--commit-filter ]\n> - [--tag-name-filter ] [--subdirectory-filter ]\n> - [--original ] [-d ] [-f | --force]\n> - [...]\"\n> +\t [--index-filter ] [--parent-filter ]\n> +\t [--msg-filter ] [--commit-filter ]\n> +\t [--tag-name-filter ] [--subdirectory-filter ]\n> +\t [--original ] [-d ] [-f | --force]\n> +\t [...]\"\n> \n> OPTIONS_SPEC=\n> . git-sh-setup\n\nEverything other than this hunk is unquestionably fine. I think this one\nalso is Ok but I wonder where the \"Indented by 12 columns\" comes\nfrom. \"Usage: git filter-branch \" that is prefixed to the first line is 25\ncolumns long, so the \"[--index-filter ...\" on the second line would not\nalign with \"[--env-filter ...\" on the first line to begin with.\n\nAnd I do not think they need to align --- the point is if the second and\nsubsequent lines do not aim to align with anything on the first line, it\nis just fine to indent them with a single HT, I think.\n"},{"id":"173001","messageId":"CAH3Anroe0b8ebg80S_Hx-QEm7Ho0Lo+x+fRYwX_ejeMyFpDfNQ@mail.gmail.com","threadId":"28027","inReplyTo":"7vmxfn3h2v.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] misc-sh: fix up whitespace in some other .sh files.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2011-08-06T03:33:48Z","receivedAt":"2011-08-06T03:33:48Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"On Sat, Aug 6, 2011 at 3:26 AM, Junio C Hamano wrote:\n> Jon Seymour writes:\n>\n>> diff --git a/git-filter-branch.sh b/git-filter-branch.sh\n>> index 962a93b..0d399aa 100755\n>> --- a/git-filter-branch.sh\n>> +++ b/git-filter-branch.sh\n>> @@ -98,11 +98,11 @@ set_ident () {\n>>  }\n>>\n>>  USAGE=\"[--env-filter ] [--tree-filter ]\n>> -            [--index-filter ] [--parent-filter ]\n>> -            [--msg-filter ] [--commit-filter ]\n>> -            [--tag-name-filter ] [--subdirectory-filter ]\n>> -            [--original ] [-d ] [-f | --force]\n>> -            [...]\"\n>> +         [--index-filter ] [--parent-filter ]\n>> +         [--msg-filter ] [--commit-filter ]\n>> +         [--tag-name-filter ] [--subdirectory-filter ]\n>> +         [--original ] [-d ] [-f | --force]\n>> +         [...]\"\n>>\n>>  OPTIONS_SPEC=\n>>  . git-sh-setup\n>\n> Everything other than this hunk is unquestionably fine. I think this one\n> also is Ok but I wonder where the \"Indented by 12 columns\" comes\n> from. \"Usage: git filter-branch \" that is prefixed to the first line is 25\n> columns long, so the \"[--index-filter ...\" on the second line would not\n> align with \"[--env-filter ...\" on the first line to begin with.\n>\n> And I do not think they need to align --- the point is if the second and\n> subsequent lines do not aim to align with anything on the first line, it\n> is just fine to indent them with a single HT, I think\n>\n\nI double checked the actual output (e.g. with git filter-branch --X) and\non the screen the output looks identical, although there is still whitespace\ndifference. So, I think it is ok.\n\njon.\n"}]}