Re: [PATCH 2/2] completion: simplify ls-files filter

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 18, 2018, 00:16 UTC
Message-ID: <xmqqk1uaxmor.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <1521274624-1370-2-git-send-email-drizzd@gmx.net>

Clemens Buchacher <drizzd@gmx.net> writes:

Show 9 quoted lines

> When filtering the ls-files output we take care not to touch absolute
> paths. This is redundant, because ls-files will never output absolute
> paths. Furthermore, sorting the output is also redundant, because the
> output of ls-files is already sorted.
>
> Remove the unnecessary operations.
>
> Signed-off-by: Clemens Buchacher <drizzd@gmx.net>
> ---

Makes sense, and I think you can and should just directly jump to this concluding state without having an intermediate "sed" version. The fact that the code does not have to worry about absolute paths and unsorted input is shared with the original version, too, so the proposed log message for this one applies equally well to such a squashed patch.

Show 16 quoted lines

>  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 e3ddf27..394c3df 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -384,7 +384,7 @@ __git_index_files ()
>  	local root="${2-.}" file
>  
>  	__git_ls_files_helper "$root" "$1" |
> -	sed -e '/^\//! s#/.*##' | sort | uniq
> +	cut -f1 -d/ | uniq
>  }
>  
>  # Lists branches from the local repository.