mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
f12785a3a7
Our git-aware path completion doesn't work when it has to complete a
word already containing quoted and/or backslash-escaped characters on
the command line. The root cause of the issue is that completion
functions see all words on the command line verbatim, i.e. including
all backslash, single and double quote characters that the shell would
eventually remove when executing the finished command. These
quoting/escaping characters cause different issues depending on which
path component of the word to be completed contains them:
- The quoting/escaping is in the prefix path component(s).
Let's suppose we have a directory called 'New Dir', containing two
untracked files 'file.c' and 'file.o', and we have a gitignore
rule ignoring object files. In this case all of these:
git add New\ Dir/<TAB>
git add "New Dir/<TAB>
git add 'New Dir/<TAB>
should uniquely complete 'file.c' right away, but Bash offers both
'file.c' and 'file.o' instead. The reason for this behavior is
that our completion script uses the prefix directory name like
'git -C "New\ Dir/" ls-files ...", i.e. with the backslash inside
double quotes. Git then tries to enter a directory called
'New\ Dir', which (most likely) fails because such a directory
doesn't exists. As a result our completion script doesn't list
any files, leaves the COMPREPLY array empty, which in turn causes
Bash to fall back to its simple filename completion and lists all
files in that directory, i.e. both 'file.c' and 'file.o'.
- The quoting/escaping is in the path component to be completed.
Let's suppose we have two untracked files 'New File.c' and
'New File.o', and we have a gitignore rule ignoring object files.
In this case all of these:
git add New\ Fi<TAB>
git add "New Fi<TAB>
git add 'New Fi<TAB>
should uniquely complete 'New File.c' right away, but Bash offers
both 'New File.c' and 'New File.o' instead. The reason for this
behavior is that our completion script uses this 'New\ Fi' or
'"New Fi' etc. word to filter matching paths, and of course none
of the potential filenames will match because of the included
backslash or double quote. The end result is the same as above:
the completion script doesn't list any files, Bash falls back to
its filename completion, which then lists the matching object file
as well.
Add the new helper function __git_dequote() [1], which removes (most
of[2]) the quoting and escaping from the word it gets as argument. To
minimize the overhead of calling this function, store its result in
the variable $dequoted_word, supposed to be declared local in the
caller; simply printing the result would require a command
substitution imposing the overhead of fork()ing a subshell. Use this
function in __git_complete_index_file() to dequote the current word,
i.e. the path, to be completed, to avoid the above described
quoting-related issues, thereby fixing two of the failing quoted path
completion tests.
[1] The bash-completion project already has a dequote() function,
which I hoped I could borrow to deal with this, but unfortunately
it doesn't work quite well for this purpose (perhaps that's why
even the bash-completion project only rarely uses it). The main
issue is that their dequote() is implemented as:
eval printf %s "$1" 2> /dev/null
where $1 would contain the word to be completed. While it's a
short and sweet one-liner, the use of 'eval' requires that $1 is a
syntactically valid string, which is not the case when quoting the
path like 'git add "New Dir/<TAB>'. This causes 'eval' to fail,
because it can't find the matching closing double quote, and the
function returns nothing. The result is totally broken behavior,
as if the current word were empty, and the completion script would
then list all files from the current directory. This is why one
of the quoted path completion tests specifically checks the
completion of a path with an opening but without a corresponding
closing double quote character. Furthermore, the 'eval' performs
all kinds of expansions, which may or may not be desired; I think
it's the latter. Finally, using this function would require a
command substitution.
[2] Bash understands the $'string' quoting as well, which "expands to
'string', with backslash-escaped characters replaced as specified
by the ANSI C standard" (quoted from Bash manpage). Since shell
metacharacters, field separators, globbing, etc. can all be easily
entered using standard shell escaping or quoting, this type of
quoting comes in handly when dealing with control characters that
are otherwise difficult both to "type" and to see on the command
line. Because of this difficulty I would assume that people do
avoid pathnames with such control characters anyway, so I didn't
bother implementing it. This function is already way too long as
it is.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1671 lines
38 KiB
Bash
Executable file
1671 lines
38 KiB
Bash
Executable file
#!/bin/sh
|
||
#
|
||
# Copyright (c) 2012 Felipe Contreras
|
||
#
|
||
|
||
test_description='test bash completion'
|
||
|
||
. ./lib-bash.sh
|
||
|
||
complete ()
|
||
{
|
||
# do nothing
|
||
return 0
|
||
}
|
||
|
||
# Be careful when updating this list:
|
||
#
|
||
# (1) The build tree may have build artifact from different branch, or
|
||
# the user's $PATH may have a random executable that may begin
|
||
# with "git-check" that are not part of the subcommands this build
|
||
# will ship, e.g. "check-ignore". The tests for completion for
|
||
# subcommand names tests how "check" is expanded; we limit the
|
||
# possible candidates to "checkout" and "check-attr" to make sure
|
||
# "check-attr", which is known by the filter function as a
|
||
# subcommand to be thrown out, while excluding other random files
|
||
# that happen to begin with "check" to avoid letting them get in
|
||
# the way.
|
||
#
|
||
# (2) A test makes sure that common subcommands are included in the
|
||
# completion for "git <TAB>", and a plumbing is excluded. "add",
|
||
# "filter-branch" and "ls-files" are listed for this.
|
||
|
||
GIT_TESTING_COMMAND_COMPLETION='add checkout check-attr filter-branch ls-files'
|
||
|
||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
|
||
|
||
# We don't need this function to actually join words or do anything special.
|
||
# Also, it's cleaner to avoid touching bash's internal completion variables.
|
||
# So let's override it with a minimal version for testing purposes.
|
||
_get_comp_words_by_ref ()
|
||
{
|
||
while [ $# -gt 0 ]; do
|
||
case "$1" in
|
||
cur)
|
||
cur=${_words[_cword]}
|
||
;;
|
||
prev)
|
||
prev=${_words[_cword-1]}
|
||
;;
|
||
words)
|
||
words=("${_words[@]}")
|
||
;;
|
||
cword)
|
||
cword=$_cword
|
||
;;
|
||
esac
|
||
shift
|
||
done
|
||
}
|
||
|
||
print_comp ()
|
||
{
|
||
local IFS=$'\n'
|
||
echo "${COMPREPLY[*]}" > out
|
||
}
|
||
|
||
run_completion ()
|
||
{
|
||
local -a COMPREPLY _words
|
||
local _cword
|
||
_words=( $1 )
|
||
test "${1: -1}" = ' ' && _words[${#_words[@]}+1]=''
|
||
(( _cword = ${#_words[@]} - 1 ))
|
||
__git_wrap__git_main && print_comp
|
||
}
|
||
|
||
# Test high-level completion
|
||
# Arguments are:
|
||
# 1: typed text so far (cur)
|
||
# 2: expected completion
|
||
test_completion ()
|
||
{
|
||
if test $# -gt 1
|
||
then
|
||
printf '%s\n' "$2" >expected
|
||
else
|
||
sed -e 's/Z$//' >expected
|
||
fi &&
|
||
run_completion "$1" &&
|
||
test_cmp expected out
|
||
}
|
||
|
||
# Test __gitcomp.
|
||
# The first argument is the typed text so far (cur); the rest are
|
||
# passed to __gitcomp. Expected output comes is read from the
|
||
# standard input, like test_completion().
|
||
test_gitcomp ()
|
||
{
|
||
local -a COMPREPLY &&
|
||
sed -e 's/Z$//' >expected &&
|
||
local cur="$1" &&
|
||
shift &&
|
||
__gitcomp "$@" &&
|
||
print_comp &&
|
||
test_cmp expected out
|
||
}
|
||
|
||
# Test __gitcomp_nl
|
||
# Arguments are:
|
||
# 1: current word (cur)
|
||
# -: the rest are passed to __gitcomp_nl
|
||
test_gitcomp_nl ()
|
||
{
|
||
local -a COMPREPLY &&
|
||
sed -e 's/Z$//' >expected &&
|
||
local cur="$1" &&
|
||
shift &&
|
||
__gitcomp_nl "$@" &&
|
||
print_comp &&
|
||
test_cmp expected out
|
||
}
|
||
|
||
invalid_variable_name='${foo.bar}'
|
||
|
||
actual="$TRASH_DIRECTORY/actual"
|
||
|
||
if test_have_prereq MINGW
|
||
then
|
||
ROOT="$(pwd -W)"
|
||
else
|
||
ROOT="$(pwd)"
|
||
fi
|
||
|
||
test_expect_success 'setup for __git_find_repo_path/__gitdir tests' '
|
||
mkdir -p subdir/subsubdir &&
|
||
mkdir -p non-repo &&
|
||
git init otherrepo
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - from command line (through $__git_dir)' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
__git_dir="$ROOT/otherrepo/.git" &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - .git directory in cwd' '
|
||
echo ".git" >expected &&
|
||
(
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - .git directory in parent' '
|
||
echo "$ROOT/.git" >expected &&
|
||
(
|
||
cd subdir/subsubdir &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - cwd is a .git directory' '
|
||
echo "." >expected &&
|
||
(
|
||
cd .git &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - parent is a .git directory' '
|
||
echo "$ROOT/.git" >expected &&
|
||
(
|
||
cd .git/refs/heads &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - $GIT_DIR set while .git directory in cwd' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
GIT_DIR="$ROOT/otherrepo/.git" &&
|
||
export GIT_DIR &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - $GIT_DIR set while .git directory in parent' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
GIT_DIR="$ROOT/otherrepo/.git" &&
|
||
export GIT_DIR &&
|
||
cd subdir &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - from command line while "git -C"' '
|
||
echo "$ROOT/.git" >expected &&
|
||
(
|
||
__git_dir="$ROOT/.git" &&
|
||
__git_C_args=(-C otherrepo) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - relative dir from command line and "git -C"' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
cd subdir &&
|
||
__git_dir="otherrepo/.git" &&
|
||
__git_C_args=(-C ..) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - $GIT_DIR set while "git -C"' '
|
||
echo "$ROOT/.git" >expected &&
|
||
(
|
||
GIT_DIR="$ROOT/.git" &&
|
||
export GIT_DIR &&
|
||
__git_C_args=(-C otherrepo) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - relative dir in $GIT_DIR and "git -C"' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
cd subdir &&
|
||
GIT_DIR="otherrepo/.git" &&
|
||
export GIT_DIR &&
|
||
__git_C_args=(-C ..) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - "git -C" while .git directory in cwd' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
__git_C_args=(-C otherrepo) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - "git -C" while cwd is a .git directory' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
cd .git &&
|
||
__git_C_args=(-C .. -C otherrepo) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - "git -C" while .git directory in parent' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
(
|
||
cd subdir &&
|
||
__git_C_args=(-C .. -C otherrepo) &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - non-existing path in "git -C"' '
|
||
(
|
||
__git_C_args=(-C non-existing) &&
|
||
test_must_fail __git_find_repo_path &&
|
||
printf "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - non-existing path in $__git_dir' '
|
||
(
|
||
__git_dir="non-existing" &&
|
||
test_must_fail __git_find_repo_path &&
|
||
printf "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - non-existing $GIT_DIR' '
|
||
(
|
||
GIT_DIR="$ROOT/non-existing" &&
|
||
export GIT_DIR &&
|
||
test_must_fail __git_find_repo_path &&
|
||
printf "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - gitfile in cwd' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
echo "gitdir: $ROOT/otherrepo/.git" >subdir/.git &&
|
||
test_when_finished "rm -f subdir/.git" &&
|
||
(
|
||
cd subdir &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - gitfile in parent' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
echo "gitdir: $ROOT/otherrepo/.git" >subdir/.git &&
|
||
test_when_finished "rm -f subdir/.git" &&
|
||
(
|
||
cd subdir/subsubdir &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success SYMLINKS '__git_find_repo_path - resulting path avoids symlinks' '
|
||
echo "$ROOT/otherrepo/.git" >expected &&
|
||
mkdir otherrepo/dir &&
|
||
test_when_finished "rm -rf otherrepo/dir" &&
|
||
ln -s otherrepo/dir link &&
|
||
test_when_finished "rm -f link" &&
|
||
(
|
||
cd link &&
|
||
__git_find_repo_path &&
|
||
echo "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_find_repo_path - not a git repository' '
|
||
(
|
||
cd non-repo &&
|
||
GIT_CEILING_DIRECTORIES="$ROOT" &&
|
||
export GIT_CEILING_DIRECTORIES &&
|
||
test_must_fail __git_find_repo_path &&
|
||
printf "$__git_repo_path" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__gitdir - finds repo' '
|
||
echo "$ROOT/.git" >expected &&
|
||
(
|
||
cd subdir/subsubdir &&
|
||
__gitdir >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
|
||
test_expect_success '__gitdir - returns error when cant find repo' '
|
||
(
|
||
__git_dir="non-existing" &&
|
||
test_must_fail __gitdir >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__gitdir - repo as argument' '
|
||
echo "otherrepo/.git" >expected &&
|
||
(
|
||
__gitdir "otherrepo" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__gitdir - remote as argument' '
|
||
echo "remote" >expected &&
|
||
(
|
||
__gitdir "remote" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
|
||
test_expect_success '__git_dequote - plain unquoted word' '
|
||
__git_dequote unquoted-word &&
|
||
verbose test unquoted-word = "$dequoted_word"
|
||
'
|
||
|
||
# input: b\a\c\k\'\\\"s\l\a\s\h\es
|
||
# expected: back'\"slashes
|
||
test_expect_success '__git_dequote - backslash escaped' '
|
||
__git_dequote "b\a\c\k\\'\''\\\\\\\"s\l\a\s\h\es" &&
|
||
verbose test "back'\''\\\"slashes" = "$dequoted_word"
|
||
'
|
||
|
||
# input: sin'gle\' '"quo'ted
|
||
# expected: single\ "quoted
|
||
test_expect_success '__git_dequote - single quoted' '
|
||
__git_dequote "'"sin'gle\\\\' '\\\"quo'ted"'" &&
|
||
verbose test '\''single\ "quoted'\'' = "$dequoted_word"
|
||
'
|
||
|
||
# input: dou"ble\\" "\"\quot"ed
|
||
# expected: double\ "\quoted
|
||
test_expect_success '__git_dequote - double quoted' '
|
||
__git_dequote '\''dou"ble\\" "\"\quot"ed'\'' &&
|
||
verbose test '\''double\ "\quoted'\'' = "$dequoted_word"
|
||
'
|
||
|
||
# input: 'open single quote
|
||
test_expect_success '__git_dequote - open single quote' '
|
||
__git_dequote "'\''open single quote" &&
|
||
verbose test "open single quote" = "$dequoted_word"
|
||
'
|
||
|
||
# input: "open double quote
|
||
test_expect_success '__git_dequote - open double quote' '
|
||
__git_dequote "\"open double quote" &&
|
||
verbose test "open double quote" = "$dequoted_word"
|
||
'
|
||
|
||
|
||
test_expect_success '__gitcomp_direct - puts everything into COMPREPLY as-is' '
|
||
sed -e "s/Z$//g" >expected <<-EOF &&
|
||
with-trailing-space Z
|
||
without-trailing-spaceZ
|
||
--option Z
|
||
--option=Z
|
||
$invalid_variable_name Z
|
||
EOF
|
||
(
|
||
cur=should_be_ignored &&
|
||
__gitcomp_direct "$(cat expected)" &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__gitcomp - trailing space - options' '
|
||
test_gitcomp "--re" "--dry-run --reuse-message= --reedit-message=
|
||
--reset-author" <<-EOF
|
||
--reuse-message=Z
|
||
--reedit-message=Z
|
||
--reset-author Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp - trailing space - config keys' '
|
||
test_gitcomp "br" "branch. branch.autosetupmerge
|
||
branch.autosetuprebase browser." <<-\EOF
|
||
branch.Z
|
||
branch.autosetupmerge Z
|
||
branch.autosetuprebase Z
|
||
browser.Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp - option parameter' '
|
||
test_gitcomp "--strategy=re" "octopus ours recursive resolve subtree" \
|
||
"" "re" <<-\EOF
|
||
recursive Z
|
||
resolve Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp - prefix' '
|
||
test_gitcomp "branch.me" "remote merge mergeoptions rebase" \
|
||
"branch.maint." "me" <<-\EOF
|
||
branch.maint.merge Z
|
||
branch.maint.mergeoptions Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp - suffix' '
|
||
test_gitcomp "branch.me" "master maint next pu" "branch." \
|
||
"ma" "." <<-\EOF
|
||
branch.master.Z
|
||
branch.maint.Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
|
||
__gitcomp "$invalid_variable_name"
|
||
'
|
||
|
||
read -r -d "" refs <<-\EOF
|
||
maint
|
||
master
|
||
next
|
||
pu
|
||
EOF
|
||
|
||
test_expect_success '__gitcomp_nl - trailing space' '
|
||
test_gitcomp_nl "m" "$refs" <<-EOF
|
||
maint Z
|
||
master Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp_nl - prefix' '
|
||
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
|
||
--fixup=maint Z
|
||
--fixup=master Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp_nl - suffix' '
|
||
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
|
||
branch.maint.Z
|
||
branch.master.Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp_nl - no suffix' '
|
||
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
|
||
maintZ
|
||
masterZ
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name' '
|
||
__gitcomp_nl "$invalid_variable_name"
|
||
'
|
||
|
||
test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from config file' '
|
||
cat >expect <<-EOF &&
|
||
remote_from_file_1
|
||
remote_from_file_2
|
||
remote_in_config_1
|
||
remote_in_config_2
|
||
EOF
|
||
test_when_finished "rm -rf .git/remotes" &&
|
||
mkdir -p .git/remotes &&
|
||
>.git/remotes/remote_from_file_1 &&
|
||
>.git/remotes/remote_from_file_2 &&
|
||
test_when_finished "git remote remove remote_in_config_1" &&
|
||
git remote add remote_in_config_1 git://remote_1 &&
|
||
test_when_finished "git remote remove remote_in_config_2" &&
|
||
git remote add remote_in_config_2 git://remote_2 &&
|
||
(
|
||
__git_remotes >actual
|
||
) &&
|
||
test_cmp expect actual
|
||
'
|
||
|
||
test_expect_success '__git_is_configured_remote' '
|
||
test_when_finished "git remote remove remote_1" &&
|
||
git remote add remote_1 git://remote_1 &&
|
||
test_when_finished "git remote remove remote_2" &&
|
||
git remote add remote_2 git://remote_2 &&
|
||
(
|
||
verbose __git_is_configured_remote remote_2 &&
|
||
test_must_fail __git_is_configured_remote non-existent
|
||
)
|
||
'
|
||
|
||
test_expect_success 'setup for ref completion' '
|
||
git commit --allow-empty -m initial &&
|
||
git branch matching-branch &&
|
||
git tag matching-tag &&
|
||
(
|
||
cd otherrepo &&
|
||
git commit --allow-empty -m initial &&
|
||
git branch -m master master-in-other &&
|
||
git branch branch-in-other &&
|
||
git tag tag-in-other
|
||
) &&
|
||
git remote add other "$ROOT/otherrepo/.git" &&
|
||
git fetch --no-tags other &&
|
||
rm -f .git/FETCH_HEAD &&
|
||
git init thirdrepo
|
||
'
|
||
|
||
test_expect_success '__git_refs - simple' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
master
|
||
matching-branch
|
||
other/branch-in-other
|
||
other/master-in-other
|
||
matching-tag
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - full refs' '
|
||
cat >expected <<-EOF &&
|
||
refs/heads/master
|
||
refs/heads/matching-branch
|
||
refs/remotes/other/branch-in-other
|
||
refs/remotes/other/master-in-other
|
||
refs/tags/matching-tag
|
||
EOF
|
||
(
|
||
cur=refs/heads/ &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - repo given on the command line' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
tag-in-other
|
||
EOF
|
||
(
|
||
__git_dir="$ROOT/otherrepo/.git" &&
|
||
cur= &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - remote on local file system' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
tag-in-other
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_refs otherrepo >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - remote on local file system - full refs' '
|
||
cat >expected <<-EOF &&
|
||
refs/heads/branch-in-other
|
||
refs/heads/master-in-other
|
||
refs/tags/tag-in-other
|
||
EOF
|
||
(
|
||
cur=refs/ &&
|
||
__git_refs otherrepo >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - configured remote' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_refs other >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - configured remote - full refs' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
refs/heads/branch-in-other
|
||
refs/heads/master-in-other
|
||
refs/tags/tag-in-other
|
||
EOF
|
||
(
|
||
cur=refs/ &&
|
||
__git_refs other >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - configured remote - repo given on the command line' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
EOF
|
||
(
|
||
cd thirdrepo &&
|
||
__git_dir="$ROOT/.git" &&
|
||
cur= &&
|
||
__git_refs other >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - configured remote - full refs - repo given on the command line' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
refs/heads/branch-in-other
|
||
refs/heads/master-in-other
|
||
refs/tags/tag-in-other
|
||
EOF
|
||
(
|
||
cd thirdrepo &&
|
||
__git_dir="$ROOT/.git" &&
|
||
cur=refs/ &&
|
||
__git_refs other >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - configured remote - remote name matches a directory' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
EOF
|
||
mkdir other &&
|
||
test_when_finished "rm -rf other" &&
|
||
(
|
||
cur= &&
|
||
__git_refs other >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - URL remote' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
branch-in-other
|
||
master-in-other
|
||
tag-in-other
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_refs "file://$ROOT/otherrepo/.git" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - URL remote - full refs' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
refs/heads/branch-in-other
|
||
refs/heads/master-in-other
|
||
refs/tags/tag-in-other
|
||
EOF
|
||
(
|
||
cur=refs/ &&
|
||
__git_refs "file://$ROOT/otherrepo/.git" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - non-existing remote' '
|
||
(
|
||
cur= &&
|
||
__git_refs non-existing >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - non-existing remote - full refs' '
|
||
(
|
||
cur=refs/ &&
|
||
__git_refs non-existing >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - non-existing URL remote' '
|
||
(
|
||
cur= &&
|
||
__git_refs "file://$ROOT/non-existing" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - non-existing URL remote - full refs' '
|
||
(
|
||
cur=refs/ &&
|
||
__git_refs "file://$ROOT/non-existing" >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - not in a git repository' '
|
||
(
|
||
GIT_CEILING_DIRECTORIES="$ROOT" &&
|
||
export GIT_CEILING_DIRECTORIES &&
|
||
cd subdir &&
|
||
cur= &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_must_be_empty "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - unique remote branches for git checkout DWIMery' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
master
|
||
matching-branch
|
||
other/ambiguous
|
||
other/branch-in-other
|
||
other/master-in-other
|
||
remote/ambiguous
|
||
remote/branch-in-remote
|
||
matching-tag
|
||
branch-in-other
|
||
branch-in-remote
|
||
master-in-other
|
||
EOF
|
||
for remote_ref in refs/remotes/other/ambiguous \
|
||
refs/remotes/remote/ambiguous \
|
||
refs/remotes/remote/branch-in-remote
|
||
do
|
||
git update-ref $remote_ref master &&
|
||
test_when_finished "git update-ref -d $remote_ref"
|
||
done &&
|
||
(
|
||
cur= &&
|
||
__git_refs "" 1 >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - after --opt=' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
master
|
||
matching-branch
|
||
other/branch-in-other
|
||
other/master-in-other
|
||
matching-tag
|
||
EOF
|
||
(
|
||
cur="--opt=" &&
|
||
__git_refs "" "" "" "" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - after --opt= - full refs' '
|
||
cat >expected <<-EOF &&
|
||
refs/heads/master
|
||
refs/heads/matching-branch
|
||
refs/remotes/other/branch-in-other
|
||
refs/remotes/other/master-in-other
|
||
refs/tags/matching-tag
|
||
EOF
|
||
(
|
||
cur="--opt=refs/" &&
|
||
__git_refs "" "" "" refs/ >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git refs - exluding refs' '
|
||
cat >expected <<-EOF &&
|
||
^HEAD
|
||
^master
|
||
^matching-branch
|
||
^other/branch-in-other
|
||
^other/master-in-other
|
||
^matching-tag
|
||
EOF
|
||
(
|
||
cur=^ &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git refs - exluding full refs' '
|
||
cat >expected <<-EOF &&
|
||
^refs/heads/master
|
||
^refs/heads/matching-branch
|
||
^refs/remotes/other/branch-in-other
|
||
^refs/remotes/other/master-in-other
|
||
^refs/tags/matching-tag
|
||
EOF
|
||
(
|
||
cur=^refs/ &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success 'setup for filtering matching refs' '
|
||
git branch matching/branch &&
|
||
git tag matching/tag &&
|
||
git -C otherrepo branch matching/branch-in-other &&
|
||
git fetch --no-tags other &&
|
||
rm -f .git/FETCH_HEAD
|
||
'
|
||
|
||
test_expect_success '__git_refs - dont filter refs unless told so' '
|
||
cat >expected <<-EOF &&
|
||
HEAD
|
||
master
|
||
matching-branch
|
||
matching/branch
|
||
other/branch-in-other
|
||
other/master-in-other
|
||
other/matching/branch-in-other
|
||
matching-tag
|
||
matching/tag
|
||
EOF
|
||
(
|
||
cur=master &&
|
||
__git_refs >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs' '
|
||
cat >expected <<-EOF &&
|
||
matching-branch
|
||
matching/branch
|
||
matching-tag
|
||
matching/tag
|
||
EOF
|
||
(
|
||
cur=mat &&
|
||
__git_refs "" "" "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs - full refs' '
|
||
cat >expected <<-EOF &&
|
||
refs/heads/matching-branch
|
||
refs/heads/matching/branch
|
||
EOF
|
||
(
|
||
cur=refs/heads/mat &&
|
||
__git_refs "" "" "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs - remote on local file system' '
|
||
cat >expected <<-EOF &&
|
||
master-in-other
|
||
matching/branch-in-other
|
||
EOF
|
||
(
|
||
cur=ma &&
|
||
__git_refs otherrepo "" "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs - configured remote' '
|
||
cat >expected <<-EOF &&
|
||
master-in-other
|
||
matching/branch-in-other
|
||
EOF
|
||
(
|
||
cur=ma &&
|
||
__git_refs other "" "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs - remote - full refs' '
|
||
cat >expected <<-EOF &&
|
||
refs/heads/master-in-other
|
||
refs/heads/matching/branch-in-other
|
||
EOF
|
||
(
|
||
cur=refs/heads/ma &&
|
||
__git_refs other "" "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_refs - only matching refs - checkout DWIMery' '
|
||
cat >expected <<-EOF &&
|
||
matching-branch
|
||
matching/branch
|
||
matching-tag
|
||
matching/tag
|
||
matching/branch-in-other
|
||
EOF
|
||
for remote_ref in refs/remotes/other/ambiguous \
|
||
refs/remotes/remote/ambiguous \
|
||
refs/remotes/remote/branch-in-remote
|
||
do
|
||
git update-ref $remote_ref master &&
|
||
test_when_finished "git update-ref -d $remote_ref"
|
||
done &&
|
||
(
|
||
cur=mat &&
|
||
__git_refs "" 1 "" "$cur" >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success 'teardown after filtering matching refs' '
|
||
git branch -d matching/branch &&
|
||
git tag -d matching/tag &&
|
||
git update-ref -d refs/remotes/other/matching/branch-in-other &&
|
||
git -C otherrepo branch -D matching/branch-in-other
|
||
'
|
||
|
||
test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '
|
||
cat >expected <<-EOF &&
|
||
evil-%%-%42-%(refname)..master
|
||
EOF
|
||
(
|
||
cur="evil-%%-%42-%(refname)..mas" &&
|
||
__git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual"
|
||
) &&
|
||
test_cmp expected "$actual"
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - simple' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
HEAD Z
|
||
master Z
|
||
matching-branch Z
|
||
other/branch-in-other Z
|
||
other/master-in-other Z
|
||
matching-tag Z
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_complete_refs &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - matching' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
matching-branch Z
|
||
matching-tag Z
|
||
EOF
|
||
(
|
||
cur=mat &&
|
||
__git_complete_refs &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - remote' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
HEAD Z
|
||
branch-in-other Z
|
||
master-in-other Z
|
||
EOF
|
||
(
|
||
cur=
|
||
__git_complete_refs --remote=other &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - track' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
HEAD Z
|
||
master Z
|
||
matching-branch Z
|
||
other/branch-in-other Z
|
||
other/master-in-other Z
|
||
matching-tag Z
|
||
branch-in-other Z
|
||
master-in-other Z
|
||
EOF
|
||
(
|
||
cur=
|
||
__git_complete_refs --track &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - current word' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
matching-branch Z
|
||
matching-tag Z
|
||
EOF
|
||
(
|
||
cur="--option=mat" &&
|
||
__git_complete_refs --cur="${cur#*=}" &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - prefix' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
v1.0..matching-branch Z
|
||
v1.0..matching-tag Z
|
||
EOF
|
||
(
|
||
cur=v1.0..mat &&
|
||
__git_complete_refs --pfx=v1.0.. --cur=mat &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_refs - suffix' '
|
||
cat >expected <<-EOF &&
|
||
HEAD.
|
||
master.
|
||
matching-branch.
|
||
other/branch-in-other.
|
||
other/master-in-other.
|
||
matching-tag.
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_complete_refs --sfx=. &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_fetch_refspecs - simple' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
HEAD:HEAD Z
|
||
branch-in-other:branch-in-other Z
|
||
master-in-other:master-in-other Z
|
||
EOF
|
||
(
|
||
cur= &&
|
||
__git_complete_fetch_refspecs other &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_fetch_refspecs - matching' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
branch-in-other:branch-in-other Z
|
||
EOF
|
||
(
|
||
cur=br &&
|
||
__git_complete_fetch_refspecs other "" br &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_fetch_refspecs - prefix' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
+HEAD:HEAD Z
|
||
+branch-in-other:branch-in-other Z
|
||
+master-in-other:master-in-other Z
|
||
EOF
|
||
(
|
||
cur="+" &&
|
||
__git_complete_fetch_refspecs other "+" "" &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
refs/heads/branch-in-other:refs/heads/branch-in-other Z
|
||
refs/heads/master-in-other:refs/heads/master-in-other Z
|
||
refs/tags/tag-in-other:refs/tags/tag-in-other Z
|
||
EOF
|
||
(
|
||
cur=refs/ &&
|
||
__git_complete_fetch_refspecs other "" refs/ &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
+refs/heads/branch-in-other:refs/heads/branch-in-other Z
|
||
+refs/heads/master-in-other:refs/heads/master-in-other Z
|
||
+refs/tags/tag-in-other:refs/tags/tag-in-other Z
|
||
EOF
|
||
(
|
||
cur=+refs/ &&
|
||
__git_complete_fetch_refspecs other + refs/ &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_success 'teardown after ref completion' '
|
||
git branch -d matching-branch &&
|
||
git tag -d matching-tag &&
|
||
git remote remove other
|
||
'
|
||
|
||
test_expect_success '__git_get_config_variables' '
|
||
cat >expect <<-EOF &&
|
||
name-1
|
||
name-2
|
||
EOF
|
||
test_config interesting.name-1 good &&
|
||
test_config interesting.name-2 good &&
|
||
test_config subsection.interesting.name-3 bad &&
|
||
__git_get_config_variables interesting >actual &&
|
||
test_cmp expect actual
|
||
'
|
||
|
||
test_expect_success '__git_pretty_aliases' '
|
||
cat >expect <<-EOF &&
|
||
author
|
||
hash
|
||
EOF
|
||
test_config pretty.author "%an %ae" &&
|
||
test_config pretty.hash %H &&
|
||
__git_pretty_aliases >actual &&
|
||
test_cmp expect actual
|
||
'
|
||
|
||
test_expect_success '__git_aliases' '
|
||
cat >expect <<-EOF &&
|
||
ci
|
||
co
|
||
EOF
|
||
test_config alias.ci commit &&
|
||
test_config alias.co checkout &&
|
||
__git_aliases >actual &&
|
||
test_cmp expect actual
|
||
'
|
||
|
||
test_expect_success 'basic' '
|
||
run_completion "git " &&
|
||
# built-in
|
||
grep -q "^add \$" out &&
|
||
# script
|
||
grep -q "^filter-branch \$" out &&
|
||
# plumbing
|
||
! grep -q "^ls-files \$" out &&
|
||
|
||
run_completion "git f" &&
|
||
! grep -q -v "^f" out
|
||
'
|
||
|
||
test_expect_success 'double dash "git" itself' '
|
||
test_completion "git --" <<-\EOF
|
||
--paginate Z
|
||
--no-pager Z
|
||
--git-dir=
|
||
--bare Z
|
||
--version Z
|
||
--exec-path Z
|
||
--exec-path=
|
||
--html-path Z
|
||
--man-path Z
|
||
--info-path Z
|
||
--work-tree=
|
||
--namespace=
|
||
--no-replace-objects Z
|
||
--help Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'double dash "git checkout"' '
|
||
test_completion "git checkout --" <<-\EOF
|
||
--quiet Z
|
||
--detach Z
|
||
--track Z
|
||
--orphan=Z
|
||
--ours Z
|
||
--theirs Z
|
||
--merge Z
|
||
--conflict=Z
|
||
--patch Z
|
||
--ignore-skip-worktree-bits Z
|
||
--ignore-other-worktrees Z
|
||
--recurse-submodules Z
|
||
--progress Z
|
||
--no-track Z
|
||
--no-recurse-submodules Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'general options' '
|
||
test_completion "git --ver" "--version " &&
|
||
test_completion "git --hel" "--help " &&
|
||
test_completion "git --exe" <<-\EOF &&
|
||
--exec-path Z
|
||
--exec-path=
|
||
EOF
|
||
test_completion "git --htm" "--html-path " &&
|
||
test_completion "git --pag" "--paginate " &&
|
||
test_completion "git --no-p" "--no-pager " &&
|
||
test_completion "git --git" "--git-dir=" &&
|
||
test_completion "git --wor" "--work-tree=" &&
|
||
test_completion "git --nam" "--namespace=" &&
|
||
test_completion "git --bar" "--bare " &&
|
||
test_completion "git --inf" "--info-path " &&
|
||
test_completion "git --no-r" "--no-replace-objects "
|
||
'
|
||
|
||
test_expect_success 'general options plus command' '
|
||
test_completion "git --version check" "checkout " &&
|
||
test_completion "git --paginate check" "checkout " &&
|
||
test_completion "git --git-dir=foo check" "checkout " &&
|
||
test_completion "git --bare check" "checkout " &&
|
||
test_completion "git --exec-path=foo check" "checkout " &&
|
||
test_completion "git --html-path check" "checkout " &&
|
||
test_completion "git --no-pager check" "checkout " &&
|
||
test_completion "git --work-tree=foo check" "checkout " &&
|
||
test_completion "git --namespace=foo check" "checkout " &&
|
||
test_completion "git --paginate check" "checkout " &&
|
||
test_completion "git --info-path check" "checkout " &&
|
||
test_completion "git --no-replace-objects check" "checkout " &&
|
||
test_completion "git --git-dir some/path check" "checkout " &&
|
||
test_completion "git -c conf.var=value check" "checkout " &&
|
||
test_completion "git -C some/path check" "checkout " &&
|
||
test_completion "git --work-tree some/path check" "checkout " &&
|
||
test_completion "git --namespace name/space check" "checkout "
|
||
'
|
||
|
||
test_expect_success 'git --help completion' '
|
||
test_completion "git --help ad" "add " &&
|
||
test_completion "git --help core" "core-tutorial "
|
||
'
|
||
|
||
test_expect_success 'setup for integration tests' '
|
||
echo content >file1 &&
|
||
echo more >file2 &&
|
||
git add file1 file2 &&
|
||
git commit -m one &&
|
||
git branch mybranch &&
|
||
git tag mytag
|
||
'
|
||
|
||
test_expect_success 'checkout completes ref names' '
|
||
test_completion "git checkout m" <<-\EOF
|
||
master Z
|
||
mybranch Z
|
||
mytag Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'git -C <path> checkout uses the right repo' '
|
||
test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF
|
||
branch-in-other Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'show completes all refs' '
|
||
test_completion "git show m" <<-\EOF
|
||
master Z
|
||
mybranch Z
|
||
mytag Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success '<ref>: completes paths' '
|
||
test_completion "git show mytag:f" <<-\EOF
|
||
file1 Z
|
||
file2 Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'complete tree filename with spaces' '
|
||
echo content >"name with spaces" &&
|
||
git add "name with spaces" &&
|
||
git commit -m spaces &&
|
||
test_completion "git show HEAD:nam" <<-\EOF
|
||
name with spaces Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'complete tree filename with metacharacters' '
|
||
echo content >"name with \${meta}" &&
|
||
git add "name with \${meta}" &&
|
||
git commit -m meta &&
|
||
test_completion "git show HEAD:nam" <<-\EOF
|
||
name with ${meta} Z
|
||
name with spaces Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'send-email' '
|
||
test_completion "git send-email --cov" "--cover-letter " &&
|
||
test_completion "git send-email ma" "master "
|
||
'
|
||
|
||
test_expect_success 'complete files' '
|
||
git init tmp && cd tmp &&
|
||
test_when_finished "cd .. && rm -rf tmp" &&
|
||
|
||
echo "expected" > .gitignore &&
|
||
echo "out" >> .gitignore &&
|
||
|
||
git add .gitignore &&
|
||
test_completion "git commit " ".gitignore" &&
|
||
|
||
git commit -m ignore &&
|
||
|
||
touch new &&
|
||
test_completion "git add " "new" &&
|
||
|
||
git add new &&
|
||
git commit -a -m new &&
|
||
test_completion "git add " "" &&
|
||
|
||
git mv new modified &&
|
||
echo modify > modified &&
|
||
test_completion "git add " "modified" &&
|
||
|
||
touch untracked &&
|
||
|
||
: TODO .gitignore should not be here &&
|
||
test_completion "git rm " <<-\EOF &&
|
||
.gitignore
|
||
modified
|
||
EOF
|
||
|
||
test_completion "git clean " "untracked" &&
|
||
|
||
: TODO .gitignore should not be here &&
|
||
test_completion "git mv " <<-\EOF &&
|
||
.gitignore
|
||
modified
|
||
EOF
|
||
|
||
mkdir dir &&
|
||
touch dir/file-in-dir &&
|
||
git add dir/file-in-dir &&
|
||
git commit -m dir &&
|
||
|
||
mkdir untracked-dir &&
|
||
|
||
: TODO .gitignore should not be here &&
|
||
test_completion "git mv modified " <<-\EOF &&
|
||
.gitignore
|
||
dir
|
||
modified
|
||
untracked
|
||
untracked-dir
|
||
EOF
|
||
|
||
test_completion "git commit " "modified" &&
|
||
|
||
: TODO .gitignore should not be here &&
|
||
test_completion "git ls-files " <<-\EOF &&
|
||
.gitignore
|
||
dir
|
||
modified
|
||
EOF
|
||
|
||
touch momified &&
|
||
test_completion "git add mom" "momified"
|
||
'
|
||
|
||
# The next tests only care about how the completion script deals with
|
||
# unusual characters in path names. By defining a custom completion
|
||
# function to list untracked files they won't be influenced by future
|
||
# changes of the completion functions of real git commands, and we
|
||
# don't have to bother with adding files to the index in these tests.
|
||
_git_test_path_comp ()
|
||
{
|
||
__git_complete_index_file --others
|
||
}
|
||
|
||
test_expect_success 'complete files - escaped characters on cmdline' '
|
||
test_when_finished "rm -rf \"New|Dir\"" &&
|
||
mkdir "New|Dir" &&
|
||
>"New|Dir/New&File.c" &&
|
||
|
||
test_completion "git test-path-comp N" \
|
||
"New|Dir" && # Bash will turn this into "New\|Dir/"
|
||
test_completion "git test-path-comp New\\|D" \
|
||
"New|Dir" &&
|
||
test_completion "git test-path-comp New\\|Dir/N" \
|
||
"New|Dir/New&File.c" && # Bash will turn this into
|
||
# "New\|Dir/New\&File.c "
|
||
test_completion "git test-path-comp New\\|Dir/New\\&F" \
|
||
"New|Dir/New&File.c"
|
||
'
|
||
|
||
test_expect_success 'complete files - quoted characters on cmdline' '
|
||
test_when_finished "rm -r \"New(Dir\"" &&
|
||
mkdir "New(Dir" &&
|
||
>"New(Dir/New)File.c" &&
|
||
|
||
# Testing with an opening but without a corresponding closing
|
||
# double quote is important.
|
||
test_completion "git test-path-comp \"New(D" "New(Dir" &&
|
||
test_completion "git test-path-comp \"New(Dir/New)F" \
|
||
"New(Dir/New)File.c"
|
||
'
|
||
|
||
test_expect_success 'complete files - UTF-8 in ls-files output' '
|
||
test_when_finished "rm -r árvíztűrő" &&
|
||
mkdir árvíztűrő &&
|
||
>"árvíztűrő/Сайн яваарай" &&
|
||
|
||
test_completion "git test-path-comp á" "árvíztűrő" &&
|
||
test_completion "git test-path-comp árvíztűrő/С" \
|
||
"árvíztűrő/Сайн яваарай"
|
||
'
|
||
|
||
if test_have_prereq !MINGW &&
|
||
mkdir 'New\Dir' 2>/dev/null &&
|
||
touch 'New\Dir/New"File.c' 2>/dev/null
|
||
then
|
||
test_set_prereq FUNNYNAMES_BS_DQ
|
||
else
|
||
say "Your filesystem does not allow \\ and \" in filenames."
|
||
rm -rf 'New\Dir'
|
||
fi
|
||
test_expect_failure FUNNYNAMES_BS_DQ \
|
||
'complete files - C-style escapes in ls-files output' '
|
||
test_when_finished "rm -r \"New\\\\Dir\"" &&
|
||
|
||
test_completion "git test-path-comp N" "New\\Dir" &&
|
||
test_completion "git test-path-comp New\\\\D" "New\\Dir" &&
|
||
test_completion "git test-path-comp New\\\\Dir/N" \
|
||
"New\\Dir/New\"File.c" &&
|
||
test_completion "git test-path-comp New\\\\Dir/New\\\"F" \
|
||
"New\\Dir/New\"File.c"
|
||
'
|
||
|
||
if test_have_prereq !MINGW &&
|
||
mkdir $'New\034Special\035Dir' 2>/dev/null &&
|
||
touch $'New\034Special\035Dir/New\036Special\037File' 2>/dev/null
|
||
then
|
||
test_set_prereq FUNNYNAMES_SEPARATORS
|
||
else
|
||
say 'Your filesystem does not allow special separator characters (FS, GS, RS, US) in filenames.'
|
||
rm -rf $'New\034Special\035Dir'
|
||
fi
|
||
test_expect_failure FUNNYNAMES_SEPARATORS \
|
||
'complete files - \nnn-escaped control characters in ls-files output' '
|
||
test_when_finished "rm -r '$'New\034Special\035Dir''" &&
|
||
|
||
# Note: these will be literal separator characters on the cmdline.
|
||
test_completion "git test-path-comp N" "'$'New\034Special\035Dir''" &&
|
||
test_completion "git test-path-comp '$'New\034S''" \
|
||
"'$'New\034Special\035Dir''" &&
|
||
test_completion "git test-path-comp '$'New\034Special\035Dir/''" \
|
||
"'$'New\034Special\035Dir/New\036Special\037File''" &&
|
||
test_completion "git test-path-comp '$'New\034Special\035Dir/New\036S''" \
|
||
"'$'New\034Special\035Dir/New\036Special\037File''"
|
||
'
|
||
|
||
|
||
test_expect_success "completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'" '
|
||
test_config alias.co "!sh -c '"'"'git checkout ...'"'"'" &&
|
||
test_completion "git co m" <<-\EOF
|
||
master Z
|
||
mybranch Z
|
||
mytag Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }' '
|
||
test_config alias.co "!f () { VAR=val git checkout ... ; } f" &&
|
||
test_completion "git co m" <<-\EOF
|
||
master Z
|
||
mybranch Z
|
||
mytag Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }' '
|
||
test_config alias.co "!f() { : git checkout ; if ... } f" &&
|
||
test_completion "git co m" <<-\EOF
|
||
master Z
|
||
mybranch Z
|
||
mytag Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_success 'completion without explicit _git_xxx function' '
|
||
test_completion "git version --" <<-\EOF
|
||
--build-options Z
|
||
EOF
|
||
'
|
||
|
||
test_expect_failure 'complete with tilde expansion' '
|
||
git init tmp && cd tmp &&
|
||
test_when_finished "cd .. && rm -rf tmp" &&
|
||
|
||
touch ~/tmp/file &&
|
||
|
||
test_completion "git add ~/tmp/" "~/tmp/file"
|
||
'
|
||
|
||
test_expect_success 'setup other remote for remote reference completion' '
|
||
git remote add other otherrepo &&
|
||
git fetch other
|
||
'
|
||
|
||
for flag in -d --delete
|
||
do
|
||
test_expect_success "__git_complete_remote_or_refspec - push $flag other" '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
master-in-other Z
|
||
EOF
|
||
(
|
||
words=(git push '$flag' other ma) &&
|
||
cword=${#words[@]} cur=${words[cword-1]} &&
|
||
__git_complete_remote_or_refspec &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
|
||
test_expect_failure "__git_complete_remote_or_refspec - push other $flag" '
|
||
sed -e "s/Z$//" >expected <<-EOF &&
|
||
master-in-other Z
|
||
EOF
|
||
(
|
||
words=(git push other '$flag' ma) &&
|
||
cword=${#words[@]} cur=${words[cword-1]} &&
|
||
__git_complete_remote_or_refspec &&
|
||
print_comp
|
||
) &&
|
||
test_cmp expected out
|
||
'
|
||
done
|
||
|
||
test_expect_success 'sourcing the completion script clears cached commands' '
|
||
__git_compute_all_commands &&
|
||
verbose test -n "$__git_all_commands" &&
|
||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
|
||
verbose test -z "$__git_all_commands"
|
||
'
|
||
|
||
test_expect_success 'sourcing the completion script clears cached porcelain commands' '
|
||
__git_compute_porcelain_commands &&
|
||
verbose test -n "$__git_porcelain_commands" &&
|
||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
|
||
verbose test -z "$__git_porcelain_commands"
|
||
'
|
||
|
||
test_expect_success !GETTEXT_POISON 'sourcing the completion script clears cached merge strategies' '
|
||
__git_compute_merge_strategies &&
|
||
verbose test -n "$__git_merge_strategies" &&
|
||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
|
||
verbose test -z "$__git_merge_strategies"
|
||
'
|
||
|
||
test_expect_success 'sourcing the completion script clears cached --options' '
|
||
__gitcomp_builtin checkout &&
|
||
verbose test -n "$__gitcomp_builtin_checkout" &&
|
||
__gitcomp_builtin notes_edit &&
|
||
verbose test -n "$__gitcomp_builtin_notes_edit" &&
|
||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
|
||
verbose test -z "$__gitcomp_builtin_checkout" &&
|
||
verbose test -z "$__gitcomp_builtin_notes_edit"
|
||
'
|
||
|
||
test_done
|