completion: fix completion after 'git -C <path>'

The main completion function finds the name of the git command by iterating through all the words on the command line in search for the first non-option-looking word. As it is not aware of 'git -C's mandatory path argument, if the '-C <path>' option is present, 'path' will be the first such word and it will be mistaken for a git command. This breaks completion in various ways: - If 'path' happens to match one of the commands supported by the completion script, then options of that command will be offered. - If 'path' doesn't match a supported command and doesn't contain any characters not allowed in Bash identifier names, then the completion script does basically nothing and Bash in turn falls back to filename completion for all subsequent words. - Otherwise, if 'path' does contain such an unallowed character, then it leads to a more or less ugly error message in the middle of the command line. The standard '/' directory separator is such a character, and it happens to trigger one of the uglier errors: $ git -C some/path <TAB>sh.exe": declare: `_git_some/path': not a valid identifier error: invalid key: alias.some/path Fix this by skipping 'git -C's mandatory path argument while iterating over the words on the command line. Extend the relevant test with this case and, while at it, with cases that needed similar treatment in the past ('--git-dir', '-c', '--work-tree' and '--namespace'). Additionally, silence the standard error of the 'declare' builtins looking for the completion function associated with the git command and of the 'git config' query for the aliased command. So if git ever learns a new option with a mandatory argument in the future, then, though the completion script will again misbehave, at least the command line will not be utterly disrupted by those error messages. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Feb 3, 2017 at 03:48 UTC 336d694ce4bff3e7cdedb3df1f819280026aa19f
2 files changed +10 -5
contrib/completion/git-completion.bash
+4 -4
@@ -816,7 +816,7 @@ __git_aliases ()
816 __git_aliased_command ()
817 {
818 local word cmdline=$(git --git-dir="$(__gitdir)" \
819 - config --get "alias.$1")
819 + config --get "alias.$1" 2>/dev/null)
820 for word in $cmdline; do
821 case "$word" in
822 \!gitk|gitk)
@@ -2800,7 +2800,7 @@ __git_main ()
2800 --git-dir) ((c++)) ; __git_dir="${words[c]}" ;;
2801 --bare) __git_dir="." ;;
2802 --help) command="help"; break ;;
2803 - -c|--work-tree|--namespace) ((c++)) ;;
2803 + -c|-C|--work-tree|--namespace) ((c++)) ;;
2804 -*) ;;
2805 *) command="$i"; break ;;
2806 esac
@@ -2844,13 +2844,13 @@ __git_main ()
2844 fi
2845
2846 local completion_func="_git_${command//-/_}"
2847 - declare -f $completion_func >/dev/null && $completion_func && return
2847 + declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
2848
2849 local expansion=$(__git_aliased_command "$command")
2850 if [ -n "$expansion" ]; then
2851 words[1]=$expansion
2852 completion_func="_git_${expansion//-/_}"
2853 - declare -f $completion_func >/dev/null && $completion_func
2853 + declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
2854 fi
2855 }
2856
t/t9902-completion.sh
+6 -1
@@ -755,7 +755,12 @@ test_expect_success 'general options plus command' '
755 test_completion "git --namespace=foo check" "checkout " &&
756 test_completion "git --paginate check" "checkout " &&
757 test_completion "git --info-path check" "checkout " &&
758 - test_completion "git --no-replace-objects check" "checkout "
758 + test_completion "git --no-replace-objects check" "checkout " &&
759 + test_completion "git --git-dir some/path check" "checkout " &&
760 + test_completion "git -c conf.var=value check" "checkout " &&
761 + test_completion "git -C some/path check" "checkout " &&
762 + test_completion "git --work-tree some/path check" "checkout " &&
763 + test_completion "git --namespace name/space check" "checkout "
764 '
765
766 test_expect_success 'git --help completion' '