From: "Shawn O. Pearce" <spearce@spearce.org>
To: Ted Pavlic <ted@tedpavlic.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/4] completion: Use consistent if [...] convention. No test.
Date: Wed, 11 Feb 2009 10:07:05 -0800 [thread overview]
Message-ID: <20090211180705.GL30949@spearce.org> (raw)
In-Reply-To: <1234375406-27099-3-git-send-email-ted@tedpavlic.com>
Ted Pavlic <ted@tedpavlic.com> wrote:
> The local coding convention in bash completion is to use [...] rather
> than test. Additionally,
>
> if [...]; then
>
> is preferred over
>
> if [...]
> then
>
> and so matching "if [...]\nthen" were changed accordingly.
>
> Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
> ---
> contrib/completion/git-completion.bash | 31 +++++++++++--------------------
> 1 files changed, 11 insertions(+), 20 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 6bbe09a..7706170 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -84,39 +84,30 @@ __git_ps1 ()
> if [ -n "$g" ]; then
> local r
> local b
> - if [ -d "$g/rebase-apply" ]
> - then
> - if test -f "$g/rebase-apply/rebasing"
> - then
> + if [ -d "$g/rebase-apply" ]; then
> + if [ -f "$g/rebase-apply/rebasing" ]; then
> r="|REBASE"
> - elif test -f "$g/rebase-apply/applying"
> - then
> + elif [ -f "$g/rebase-apply/applying" ]; then
There is some sort of whitespace damage right here, the elif doesn't
seem to line up correctly.
--
Shawn.
next prev parent reply other threads:[~2009-02-11 18:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 18:03 [PATCH 0/4] completion: Fixes and better non-work-tree support Ted Pavlic
2009-02-11 18:03 ` [PATCH 1/4] completion: For consistency, changed "git rev-parse" to __gitdir calls Ted Pavlic
2009-02-11 18:03 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Ted Pavlic
2009-02-11 18:03 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Ted Pavlic
2009-02-11 18:03 ` [PATCH 4/4] completion: More fixes to prevent unbound variable errors Ted Pavlic
2009-02-11 18:09 ` Shawn O. Pearce
2009-02-11 18:09 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Shawn O. Pearce
2009-02-11 18:07 ` Shawn O. Pearce [this message]
2009-02-11 18:26 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Junio C Hamano
2009-02-11 18:35 ` Shawn O. Pearce
2009-02-11 18:14 ` Junio C Hamano
2009-02-11 18:43 ` Ted Pavlic
2009-02-11 22:25 ` Jeff King
2009-02-11 18:54 ` [PATCH 0/4] completion fixes: Acks, whitespace, and r="" Ted Pavlic
2009-02-11 18:54 ` [PATCH 1/4] completion: For consistency, changed "git rev-parse" to __gitdir calls Ted Pavlic
2009-02-11 18:54 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Ted Pavlic
2009-02-11 18:54 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Ted Pavlic
2009-02-11 18:54 ` [PATCH 4/4] completion: More fixes to prevent unbound variable errors Ted Pavlic
2009-02-20 17:01 ` [PATCH 0/4] completion fixes: Acks, whitespace, and r="" Ted Pavlic
2009-02-20 17:08 ` Thomas Rast
2009-02-20 17:18 ` Ted Pavlic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090211180705.GL30949@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ted@tedpavlic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).