Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread David Aguilar
On Sun, Jan 27, 2013 at 3:32 PM, Junio C Hamano wrote: > David Aguilar writes: > >> +filter_tools () { >> + filter="$1" >> + prefix="$2" >> + ( >> + cd "$MERGE_TOOLS_DIR" && >> + for i in * >> + do >> + echo "$i" >> +

Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread Junio C Hamano
David Aguilar writes: > +filter_tools () { > + filter="$1" > + prefix="$2" > + ( > + cd "$MERGE_TOOLS_DIR" && > + for i in * > + do > + echo "$i" > + done > + ) | sort | while read tool > + do > +

Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread John Keeping
On Sun, Jan 27, 2013 at 01:24:45PM -0800, David Aguilar wrote: > +filter_tools () { > + filter="$1" > + prefix="$2" > + ( > + cd "$MERGE_TOOLS_DIR" && > + for i in * > + do > + echo "$i" > + done > + ) | sort | whil

Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread Junio C Hamano
David Aguilar writes: > Refactor show_tool_help() so that the tool-finding logic is broken out > into separate functions. > > Signed-off-by: David Aguilar > --- > git-mergetool--lib.sh | 60 > +-- > 1 file changed, 34 insertions(+), 26 deletions(

Re: [PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread Johannes Sixt
Am 27.01.2013 22:24, schrieb David Aguilar: > Refactor show_tool_help() so that the tool-finding logic is broken out > into separate functions. > > Signed-off-by: David Aguilar > --- > git-mergetool--lib.sh | 60 > +-- > 1 file changed, 34 inserti

[PATCH 3/4] mergetool--lib: Add functions for finding available tools

2013-01-27 Thread David Aguilar
Refactor show_tool_help() so that the tool-finding logic is broken out into separate functions. Signed-off-by: David Aguilar --- git-mergetool--lib.sh | 60 +-- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/git-mergetool--lib.sh b