git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/4] completion: Use consistent if [...] convention. No test.

From
Shawn O. Pearce <spearce@spearce.org>
Date
Feb 11, 2009, 18:07 UTC
Message-ID
<20090211180705.GL30949@spearce.org>
In-Reply-To
<1234375406-27099-3-git-send-email-ted@tedpavlic.com>
Ted Pavlic <ted@tedpavlic.com> wrote:
Show 35 quoted lines
> 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.
Previous: Shawn O. PearceNext: Junio C Hamano
Message 8 of 21 in “completion: Fixes and better non-work-tree support”
  1. 0/4 completion: Fixes and better non-work-tree supportTed Pavlic, Feb 11, 2009
  2. 1/4 completion: For consistency, changed "git rev-parse" to __gitdir calls.Ted Pavlic, Feb 11, 2009
  3. 2/4 completion: Use consistent if [...] convention. No test.Ted Pavlic, Feb 11, 2009
  4. 3/4 completion: Better __git_ps1 support when not in working directoryTed Pavlic, Feb 11, 2009
  5. 4/4 completion: More fixes to prevent unbound variable errors.Ted Pavlic, Feb 11, 2009
  6. Shawn O. PearceFeb 11, 2009
  7. Shawn O. PearceFeb 11, 2009
  8. Shawn O. PearceFeb 11, 2009
  9. Junio C HamanoFeb 11, 2009
  10. Shawn O. PearceFeb 11, 2009
  11. Junio C HamanoFeb 11, 2009
  12. Ted PavlicFeb 11, 2009
  13. Jeff KingFeb 11, 2009
  14. 0/4 completion fixes: Acks, whitespace, and r=""Ted Pavlic, Feb 11, 2009
  15. 1/4 completion: For consistency, changed "git rev-parse" to __gitdir calls.Ted Pavlic, Feb 11, 2009
  16. 2/4 completion: Use consistent if [...] convention. No test.Ted Pavlic, Feb 11, 2009
  17. 3/4 completion: Better __git_ps1 support when not in working directoryTed Pavlic, Feb 11, 2009
  18. 4/4 completion: More fixes to prevent unbound variable errors.Ted Pavlic, Feb 11, 2009
  19. Ted PavlicFeb 20, 2009
  20. Thomas RastFeb 20, 2009
  21. Ted PavlicFeb 20, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.