From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 05 Aug 2011 17:26:32 GMT
Subject: Re: [PATCH] misc-sh: fix up whitespace in some other .sh files.
Message-ID: <7vmxfn3h2v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1312551089-3753-1-git-send-email-jon.seymour@gmail.com>

Jon Seymour <jon.seymour@gmail.com> writes:

> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index 962a93b..0d399aa 100755
> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -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

Everything other than this hunk is unquestionably fine. I think this one
also is Ok but I wonder where the "Indented by 12 columns" comes
from. "Usage: git filter-branch " that is prefixed to the first line is 25
columns long, so the "[--index-filter ..." on the second line would not
align with "[--env-filter ..." on the first line to begin with.

And I do not think they need to align --- the point is if the second and
subsequent lines do not aim to align with anything on the first line, it
is just fine to indent them with a single HT, I think.