Re: [PATCH] Fix bash completion when `egrep` is aliased to `egrep --color=always`

2012-11-26 Thread Frans Klaver
On Mon, Nov 26, 2012 at 12:23 PM, Adam Tkac  wrote:

> Good idea, thanks. Improved patch is attached.

It is custom on this list to mail the patches, rather than attaching
them, so people can review your changes in-line. You can read more
about it in in git/Documentation/SubmittingPatches.

Cheers,
Frans
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] Fix bash completion when `egrep` is aliased to `egrep --color=always`

2012-11-26 Thread Adam Tkac
On Thu, Nov 22, 2012 at 02:55:21PM -0500, Marc Khouzam wrote:
> On Thu, Nov 22, 2012 at 10:41 AM, Adam Tkac  wrote:
> > Hello all,
> >
> > attached patch fixes bash completion when `egrep` is aliased to `egrep 
> > --color=always`.
> 
> To avoid any aliases, it may be better to use
> \egrep

Good idea, thanks. Improved patch is attached.

Regards, Adam

> 
> This could be worthwhile for all utilities used by the script.
> 
> Just a thought.
> 
> Marc
> 
> 
> >
> > Comments are welcomed.
> >
> > Regards, Adam
> >
> > --
> > Adam Tkac, Red Hat, Inc.

-- 
Adam Tkac, Red Hat, Inc.
>From 255192296cd175fddcac2647447a66a0ca55b855 Mon Sep 17 00:00:00 2001
From: Adam Tkac 
Date: Thu, 22 Nov 2012 16:34:58 +0100
Subject: [PATCH] If `egrep` is aliased, temporary disable it in
 bash.completion

Originally reported as https://bugzilla.redhat.com/show_bug.cgi?id=863780

Signed-off-by: Adam Tkac 
Signed-off-by: Holger Arnold 
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index 0960acc..79073c2 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -565,7 +565,7 @@ __git_complete_strategy ()
 __git_list_all_commands ()
 {
local i IFS=" "$'\n'
-   for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
+   for i in $(git help -a| \egrep '^  [a-zA-Z0-9]')
do
case $i in
*--*) : helper pattern;;
-- 
1.8.0



Re: [PATCH] Fix bash completion when `egrep` is aliased to `egrep --color=always`

2012-11-22 Thread Marc Khouzam
On Thu, Nov 22, 2012 at 10:41 AM, Adam Tkac  wrote:
> Hello all,
>
> attached patch fixes bash completion when `egrep` is aliased to `egrep 
> --color=always`.

To avoid any aliases, it may be better to use
\egrep

This could be worthwhile for all utilities used by the script.

Just a thought.

Marc


>
> Comments are welcomed.
>
> Regards, Adam
>
> --
> Adam Tkac, Red Hat, Inc.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Fix bash completion when `egrep` is aliased to `egrep --color=always`

2012-11-22 Thread Adam Tkac
Hello all,

attached patch fixes bash completion when `egrep` is aliased to `egrep 
--color=always`.

Comments are welcomed.

Regards, Adam

-- 
Adam Tkac, Red Hat, Inc.
>From 2b62bd71af1158129492f74f0b77c9840a49507f Mon Sep 17 00:00:00 2001
From: Adam Tkac 
Date: Thu, 22 Nov 2012 16:34:58 +0100
Subject: [PATCH] Fix bash completion when `egrep` is aliased to `egrep
 --color=always`

Originally reported as https://bugzilla.redhat.com/show_bug.cgi?id=863780

Signed-off-by: Adam Tkac 
Signed-off-by: Holger Arnold 
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index bc0657a..47613f9 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -565,7 +565,7 @@ __git_complete_strategy ()
 __git_list_all_commands ()
 {
local i IFS=" "$'\n'
-   for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
+   for i in $(git help -a|egrep --color=never '^  [a-zA-Z0-9]')
do
case $i in
*--*) : helper pattern;;
-- 
1.8.0