mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
fad9484f0a
After the previous changes in this series there are only a handful of
$(__gitdir) command substitutions left in the completion script, but
there is still a bit of room for improvements:
1. The command substitution involves the forking of a subshell,
which has considerable overhead on some platforms.
2. There are a few cases, where this command substitution is
executed more than once during a single completion, which means
multiple subshells and possibly multiple 'git rev-parse'
executions. __gitdir() is invoked twice while completing refs
for e.g. 'git log', 'git rebase', 'gitk', or while completing
remote refs for 'git fetch' or 'git push'.
Both of these points can be addressed by using the
__git_find_repo_path() helper function introduced in the previous
commit:
1. __git_find_repo_path() stores the path to the repository in a
variable instead of printing it, so the command substitution
around the function can be avoided. Or rather: the command
substitution should be avoided to make the new value of the
variable set inside the function visible to the callers.
(Yes, there is now a command substitution inside
__git_find_repo_path() around each 'git rev-parse', but that's
executed only if necessary, and only once per completion, see
point 2. below.)
2. $__git_repo_path, the variable holding the path to the
repository, is declared local in the toplevel completion
functions __git_main() and __gitk_main(). Thus, once set, the
path is visible in all completion functions, including all
subsequent calls to __git_find_repo_path(), meaning that they
wouldn't have to re-discover the path to the repository.
So call __git_find_repo_path() and use $__git_repo_path instead of the
$(__gitdir) command substitution to access paths in the .git
directory. Turn tests checking __gitdir()'s repository discovery into
tests of __git_find_repo_path() such that only the tested function
changes but the expected results don't, ensuring that repo discovery
keeps working as it did before.
As __gitdir() is not used anymore in the completion script, mark it as
deprecated and direct users' attention to __git_find_repo_path() and
$__git_repo_path. Yet keep four __gitdir() tests to ensure that it
handles success and failure of __git_find_repo_path() and that it
still handles its optional remote argument, because users' custom
completion scriptlets might depend on it.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1074 lines
24 KiB
Bash
Executable file
1074 lines
24 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 '__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
|
|
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 &&
|
|
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 &&
|
|
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 &&
|
|
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 '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
|
|
--ours Z
|
|
--theirs Z
|
|
--track Z
|
|
--no-track Z
|
|
--merge Z
|
|
--conflict=
|
|
--orphan Z
|
|
--patch 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"
|
|
'
|
|
|
|
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_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_done
|