From: Jonathan Nieder Date: Sat, 14 Nov 2009 11:01:41 GMT Subject: Re: [PATCH] Speed up bash completion loading Message-ID: <20091114110141.GB1829@progeny.tock> In-Reply-To: <4AFDC4F3.1050607@gmail.com> Stephen Boyd wrote: > I see a small problem, but it can be fixed in another patch. git > merge -s the first time when you're not in a git > directory will make git merge -s after never complete > correctly even in a git directory. Not good. I think the sanest thing to do is avoid caching the merge strategy list entirely. Listing merge strategies takes about 100 ms here, which is short enough not to be annoying. > I guess this become more serious > if git isn't in your path initially and you do git and > then git becomes part of your path and you try again. Here you lose > porcelain completion. This is probably never going to happen though, > right? Right, if this happened to me I would not be too surprised. A similar problem occurs when someone installs a new git subcommand in the middle of a session. Starting a new session fixes the completion, but should the completion script do something to help people before then? It could provide a shell function with a slightly friendlier name than "__git_compute_porcelain_commands" for the user to invoke explicitly. It could retry "git help -a" each time completion was needed if it gave no results last time (i.e. use "${__git_all_commands:=" instead of "${__git_all_commands="). This would help with the missing git problem (which seems unusual), but not the missing git-svn. Maybe it could detect signs of user frustration (repeated attempts to complete the same thing?) and add to the frustration by silently fixing the cache. -- %< -- Subject: completion: do not cache merge strategy list If "git merge -s help" fails the first time we try it (e.g. if you're not in a git directory), git merge -s never completes correctly within the same session. Reported-by: Stephen Boyd Signed-off-by: Jonathan Nieder --- contrib/completion/git-completion.bash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 748d4f9..634941f 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -332,7 +332,7 @@ __git_list_merge_strategies () __git_compute_merge_strategies () { - : ${__git_merge_strategies=$(__git_list_merge_strategies)} + __git_merge_strategies=$(__git_list_merge_strategies) } __git_complete_file () -- 1.6.5.2