mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
165293af3c
Some of the functions in our test library check that they were invoked
properly with conditions like this:
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-success"
If this particular condition is triggered, then 'error' will abort the
whole test script with a bold red error message [1] right away.
However, under certain circumstances the test script will be aborted
completely silently, namely if:
- a similar condition in a test helper function like
'test_line_count' is triggered,
- which is invoked from the test script's "main" shell [2],
- and the test script is run manually (i.e. './t1234-foo.sh' as
opposed to 'make t1234-foo.sh' or 'make test') [3]
- and without the '--verbose' option,
because the error message is printed from within 'test_eval_', where
standard output is redirected either to /dev/null or to a log file.
The only indication that something is wrong is that not all tests in
the script are executed and at the end of the test script's output
there is no "# passed all N tests" message, which are subtle and can
easily go unnoticed, as I had to experience myself.
Send these "bug in the test script" error messages directly to the
test scripts standard error and thus to the terminal, so those bugs
will be much harder to overlook. Instead of updating all ~20 such
'error' calls with a redirection, let's add a BUG() function to
'test-lib.sh', wrapping an 'error' call with the proper redirection
and also including the common prefix of those error messages, and
convert all those call sites [4] to use this new BUG() function
instead.
[1] That particular error message from 'test_expect_success' is
printed in color only when running with or without '--verbose';
with '--tee' or '--verbose-log' the error is printed without
color, but it is printed to the terminal nonetheless.
[2] If such a condition is triggered in a subshell of a test, then
'error' won't be able to abort the whole test script, but only the
subshell, which in turn causes the test to fail in the usual way,
indicating loudly and clearly that something is wrong.
[3] Well, 'error' aborts the test script the same way when run
manually or by 'make' or 'prove', but both 'make' and 'prove' pay
attention to the test script's exit status, and even a silently
aborted test script would then trigger those tools' usual
noticable error messages.
[4] Strictly speaking, not all those 'error' calls need that
redirection to send their output to the terminal, see e.g.
'test_expect_success' in the opening example, but I think it's
better to be consistent.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
469 lines
11 KiB
Bash
Executable file
469 lines
11 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git init'
|
|
|
|
. ./test-lib.sh
|
|
|
|
check_config () {
|
|
if test -d "$1" && test -f "$1/config" && test -d "$1/refs"
|
|
then
|
|
: happy
|
|
else
|
|
echo "expected a directory $1, a file $1/config and $1/refs"
|
|
return 1
|
|
fi
|
|
|
|
if test_have_prereq POSIXPERM && test -x "$1/config"
|
|
then
|
|
echo "$1/config is executable?"
|
|
return 1
|
|
fi
|
|
|
|
bare=$(cd "$1" && git config --bool core.bare)
|
|
worktree=$(cd "$1" && git config core.worktree) ||
|
|
worktree=unset
|
|
|
|
test "$bare" = "$2" && test "$worktree" = "$3" || {
|
|
echo "expected bare=$2 worktree=$3"
|
|
echo " got bare=$bare worktree=$worktree"
|
|
return 1
|
|
}
|
|
}
|
|
|
|
test_expect_success 'plain' '
|
|
git init plain &&
|
|
check_config plain/.git false unset
|
|
'
|
|
|
|
test_expect_success 'plain nested in bare' '
|
|
(
|
|
git init --bare bare-ancestor.git &&
|
|
cd bare-ancestor.git &&
|
|
mkdir plain-nested &&
|
|
cd plain-nested &&
|
|
git init
|
|
) &&
|
|
check_config bare-ancestor.git/plain-nested/.git false unset
|
|
'
|
|
|
|
test_expect_success 'plain through aliased command, outside any git repo' '
|
|
(
|
|
HOME=$(pwd)/alias-config &&
|
|
export HOME &&
|
|
mkdir alias-config &&
|
|
echo "[alias] aliasedinit = init" >alias-config/.gitconfig &&
|
|
|
|
GIT_CEILING_DIRECTORIES=$(pwd) &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
|
|
mkdir plain-aliased &&
|
|
cd plain-aliased &&
|
|
git aliasedinit
|
|
) &&
|
|
check_config plain-aliased/.git false unset
|
|
'
|
|
|
|
test_expect_success 'plain nested through aliased command' '
|
|
(
|
|
git init plain-ancestor-aliased &&
|
|
cd plain-ancestor-aliased &&
|
|
echo "[alias] aliasedinit = init" >>.git/config &&
|
|
mkdir plain-nested &&
|
|
cd plain-nested &&
|
|
git aliasedinit
|
|
) &&
|
|
check_config plain-ancestor-aliased/plain-nested/.git false unset
|
|
'
|
|
|
|
test_expect_success 'plain nested in bare through aliased command' '
|
|
(
|
|
git init --bare bare-ancestor-aliased.git &&
|
|
cd bare-ancestor-aliased.git &&
|
|
echo "[alias] aliasedinit = init" >>config &&
|
|
mkdir plain-nested &&
|
|
cd plain-nested &&
|
|
git aliasedinit
|
|
) &&
|
|
check_config bare-ancestor-aliased.git/plain-nested/.git false unset
|
|
'
|
|
|
|
test_expect_success 'No extra GIT_* on alias scripts' '
|
|
write_script script <<-\EOF &&
|
|
env |
|
|
sed -n \
|
|
-e "/^GIT_PREFIX=/d" \
|
|
-e "/^GIT_TEXTDOMAINDIR=/d" \
|
|
-e "/^GIT_/s/=.*//p" |
|
|
sort
|
|
EOF
|
|
./script >expected &&
|
|
git config alias.script \!./script &&
|
|
( mkdir sub && cd sub && git script >../actual ) &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'plain with GIT_WORK_TREE' '
|
|
mkdir plain-wt &&
|
|
test_must_fail env GIT_WORK_TREE="$(pwd)/plain-wt" git init plain-wt
|
|
'
|
|
|
|
test_expect_success 'plain bare' '
|
|
git --bare init plain-bare-1 &&
|
|
check_config plain-bare-1 true unset
|
|
'
|
|
|
|
test_expect_success 'plain bare with GIT_WORK_TREE' '
|
|
mkdir plain-bare-2 &&
|
|
test_must_fail \
|
|
env GIT_WORK_TREE="$(pwd)/plain-bare-2" \
|
|
git --bare init plain-bare-2
|
|
'
|
|
|
|
test_expect_success 'GIT_DIR bare' '
|
|
mkdir git-dir-bare.git &&
|
|
GIT_DIR=git-dir-bare.git git init &&
|
|
check_config git-dir-bare.git true unset
|
|
'
|
|
|
|
test_expect_success 'init --bare' '
|
|
git init --bare init-bare.git &&
|
|
check_config init-bare.git true unset
|
|
'
|
|
|
|
test_expect_success 'GIT_DIR non-bare' '
|
|
|
|
(
|
|
mkdir non-bare &&
|
|
cd non-bare &&
|
|
GIT_DIR=.git git init
|
|
) &&
|
|
check_config non-bare/.git false unset
|
|
'
|
|
|
|
test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
|
|
|
|
(
|
|
mkdir git-dir-wt-1.git &&
|
|
GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
|
|
) &&
|
|
check_config git-dir-wt-1.git false "$(pwd)"
|
|
'
|
|
|
|
test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
|
|
mkdir git-dir-wt-2.git &&
|
|
test_must_fail env \
|
|
GIT_WORK_TREE="$(pwd)" \
|
|
GIT_DIR=git-dir-wt-2.git \
|
|
git --bare init
|
|
'
|
|
|
|
test_expect_success 'reinit' '
|
|
|
|
(
|
|
mkdir again &&
|
|
cd again &&
|
|
git init >out1 2>err1 &&
|
|
git init >out2 2>err2
|
|
) &&
|
|
test_i18ngrep "Initialized empty" again/out1 &&
|
|
test_i18ngrep "Reinitialized existing" again/out2 &&
|
|
test_must_be_empty again/err1 &&
|
|
test_must_be_empty again/err2
|
|
'
|
|
|
|
test_expect_success 'init with --template' '
|
|
mkdir template-source &&
|
|
echo content >template-source/file &&
|
|
git init --template=../template-source template-custom &&
|
|
test_cmp template-source/file template-custom/.git/file
|
|
'
|
|
|
|
test_expect_success 'init with --template (blank)' '
|
|
git init template-plain &&
|
|
test_path_is_file template-plain/.git/info/exclude &&
|
|
git init --template= template-blank &&
|
|
test_path_is_missing template-blank/.git/info/exclude
|
|
'
|
|
|
|
test_expect_success 'init with init.templatedir set' '
|
|
mkdir templatedir-source &&
|
|
echo Content >templatedir-source/file &&
|
|
test_config_global init.templatedir "${HOME}/templatedir-source" &&
|
|
(
|
|
mkdir templatedir-set &&
|
|
cd templatedir-set &&
|
|
sane_unset GIT_TEMPLATE_DIR &&
|
|
NO_SET_GIT_TEMPLATE_DIR=t &&
|
|
export NO_SET_GIT_TEMPLATE_DIR &&
|
|
git init
|
|
) &&
|
|
test_cmp templatedir-source/file templatedir-set/.git/file
|
|
'
|
|
|
|
test_expect_success 'init --bare/--shared overrides system/global config' '
|
|
test_config_global core.bare false &&
|
|
test_config_global core.sharedRepository 0640 &&
|
|
git init --bare --shared=0666 init-bare-shared-override &&
|
|
check_config init-bare-shared-override true unset &&
|
|
test x0666 = \
|
|
x$(git config -f init-bare-shared-override/config core.sharedRepository)
|
|
'
|
|
|
|
test_expect_success 'init honors global core.sharedRepository' '
|
|
test_config_global core.sharedRepository 0666 &&
|
|
git init shared-honor-global &&
|
|
test x0666 = \
|
|
x$(git config -f shared-honor-global/.git/config core.sharedRepository)
|
|
'
|
|
|
|
test_expect_success 'init allows insanely long --template' '
|
|
git init --template=$(printf "x%09999dx" 1) test
|
|
'
|
|
|
|
test_expect_success 'init creates a new directory' '
|
|
rm -fr newdir &&
|
|
git init newdir &&
|
|
test_path_is_dir newdir/.git/refs
|
|
'
|
|
|
|
test_expect_success 'init creates a new bare directory' '
|
|
rm -fr newdir &&
|
|
git init --bare newdir &&
|
|
test_path_is_dir newdir/refs
|
|
'
|
|
|
|
test_expect_success 'init recreates a directory' '
|
|
rm -fr newdir &&
|
|
mkdir newdir &&
|
|
git init newdir &&
|
|
test_path_is_dir newdir/.git/refs
|
|
'
|
|
|
|
test_expect_success 'init recreates a new bare directory' '
|
|
rm -fr newdir &&
|
|
mkdir newdir &&
|
|
git init --bare newdir &&
|
|
test_path_is_dir newdir/refs
|
|
'
|
|
|
|
test_expect_success 'init creates a new deep directory' '
|
|
rm -fr newdir &&
|
|
git init newdir/a/b/c &&
|
|
test_path_is_dir newdir/a/b/c/.git/refs
|
|
'
|
|
|
|
test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shared)' '
|
|
rm -fr newdir &&
|
|
(
|
|
# Leading directories should honor umask while
|
|
# the repository itself should follow "shared"
|
|
mkdir newdir &&
|
|
# Remove a default ACL if possible.
|
|
(setfacl -k newdir 2>/dev/null || true) &&
|
|
umask 002 &&
|
|
git init --bare --shared=0660 newdir/a/b/c &&
|
|
test_path_is_dir newdir/a/b/c/refs &&
|
|
ls -ld newdir/a newdir/a/b > lsab.out &&
|
|
! grep -v "^drwxrw[sx]r-x" lsab.out &&
|
|
ls -ld newdir/a/b/c > lsc.out &&
|
|
! grep -v "^drwxrw[sx]---" lsc.out
|
|
)
|
|
'
|
|
|
|
test_expect_success 'init notices EEXIST (1)' '
|
|
rm -fr newdir &&
|
|
>newdir &&
|
|
test_must_fail git init newdir &&
|
|
test_path_is_file newdir
|
|
'
|
|
|
|
test_expect_success 'init notices EEXIST (2)' '
|
|
rm -fr newdir &&
|
|
mkdir newdir &&
|
|
>newdir/a &&
|
|
test_must_fail git init newdir/a/b &&
|
|
test_path_is_file newdir/a
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SANITY 'init notices EPERM' '
|
|
test_when_finished "chmod +w newdir" &&
|
|
rm -fr newdir &&
|
|
mkdir newdir &&
|
|
chmod -w newdir &&
|
|
test_must_fail git init newdir/a/b
|
|
'
|
|
|
|
test_expect_success 'init creates a new bare directory with global --bare' '
|
|
rm -rf newdir &&
|
|
git --bare init newdir &&
|
|
test_path_is_dir newdir/refs
|
|
'
|
|
|
|
test_expect_success 'init prefers command line to GIT_DIR' '
|
|
rm -rf newdir &&
|
|
mkdir otherdir &&
|
|
GIT_DIR=otherdir git --bare init newdir &&
|
|
test_path_is_dir newdir/refs &&
|
|
test_path_is_missing otherdir/refs
|
|
'
|
|
|
|
test_expect_success 'init with separate gitdir' '
|
|
rm -rf newdir &&
|
|
git init --separate-git-dir realgitdir newdir &&
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
|
test_cmp expected newdir/.git &&
|
|
test_path_is_dir realgitdir/refs
|
|
'
|
|
|
|
test_lazy_prereq GETCWD_IGNORES_PERMS '
|
|
base=GETCWD_TEST_BASE_DIR &&
|
|
mkdir -p $base/dir &&
|
|
chmod 100 $base ||
|
|
BUG "cannot prepare $base"
|
|
|
|
(cd $base/dir && /bin/pwd -P)
|
|
status=$?
|
|
|
|
chmod 700 $base &&
|
|
rm -rf $base ||
|
|
BUG "cannot clean $base"
|
|
return $status
|
|
'
|
|
|
|
check_long_base_path () {
|
|
# exceed initial buffer size of strbuf_getcwd()
|
|
component=123456789abcdef &&
|
|
test_when_finished "chmod 0700 $component; rm -rf $component" &&
|
|
p31=$component/$component &&
|
|
p127=$p31/$p31/$p31/$p31 &&
|
|
mkdir -p $p127 &&
|
|
if test $# = 1
|
|
then
|
|
chmod $1 $component
|
|
fi &&
|
|
(
|
|
cd $p127 &&
|
|
git init newdir
|
|
)
|
|
}
|
|
|
|
test_expect_success 'init in long base path' '
|
|
check_long_base_path
|
|
'
|
|
|
|
test_expect_success GETCWD_IGNORES_PERMS 'init in long restricted base path' '
|
|
check_long_base_path 0111
|
|
'
|
|
|
|
test_expect_success 're-init on .git file' '
|
|
( cd newdir && git init )
|
|
'
|
|
|
|
test_expect_success 're-init to update git link' '
|
|
(
|
|
cd newdir &&
|
|
git init --separate-git-dir ../surrealgitdir
|
|
) &&
|
|
echo "gitdir: $(pwd)/surrealgitdir" >expected &&
|
|
test_cmp expected newdir/.git &&
|
|
test_path_is_dir surrealgitdir/refs &&
|
|
test_path_is_missing realgitdir/refs
|
|
'
|
|
|
|
test_expect_success 're-init to move gitdir' '
|
|
rm -rf newdir realgitdir surrealgitdir &&
|
|
git init newdir &&
|
|
(
|
|
cd newdir &&
|
|
git init --separate-git-dir ../realgitdir
|
|
) &&
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
|
test_cmp expected newdir/.git &&
|
|
test_path_is_dir realgitdir/refs
|
|
'
|
|
|
|
test_expect_success SYMLINKS 're-init to move gitdir symlink' '
|
|
rm -rf newdir realgitdir &&
|
|
git init newdir &&
|
|
(
|
|
cd newdir &&
|
|
mv .git here &&
|
|
ln -s here .git &&
|
|
git init --separate-git-dir ../realgitdir
|
|
) &&
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
|
test_cmp expected newdir/.git &&
|
|
test_cmp expected newdir/here &&
|
|
test_path_is_dir realgitdir/refs
|
|
'
|
|
|
|
# Tests for the hidden file attribute on windows
|
|
is_hidden () {
|
|
# Use the output of `attrib`, ignore the absolute path
|
|
case "$(attrib "$1")" in *H*?:*) return 0;; esac
|
|
return 1
|
|
}
|
|
|
|
test_expect_success MINGW '.git hidden' '
|
|
rm -rf newdir &&
|
|
(
|
|
sane_unset GIT_DIR GIT_WORK_TREE &&
|
|
mkdir newdir &&
|
|
cd newdir &&
|
|
git init &&
|
|
is_hidden .git
|
|
) &&
|
|
check_config newdir/.git false unset
|
|
'
|
|
|
|
test_expect_success MINGW 'bare git dir not hidden' '
|
|
rm -rf newdir &&
|
|
(
|
|
sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
|
|
mkdir newdir &&
|
|
cd newdir &&
|
|
git --bare init
|
|
) &&
|
|
! is_hidden newdir
|
|
'
|
|
|
|
test_expect_success 'remote init from does not use config from cwd' '
|
|
rm -rf newdir &&
|
|
test_config core.logallrefupdates true &&
|
|
git init newdir &&
|
|
echo true >expect &&
|
|
git -C newdir config --bool core.logallrefupdates >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 're-init from a linked worktree' '
|
|
git init main-worktree &&
|
|
(
|
|
cd main-worktree &&
|
|
test_commit first &&
|
|
git worktree add ../linked-worktree &&
|
|
mv .git/info/exclude expected-exclude &&
|
|
cp .git/config expected-config &&
|
|
find .git/worktrees -print | sort >expected &&
|
|
git -C ../linked-worktree init &&
|
|
test_cmp expected-exclude .git/info/exclude &&
|
|
test_cmp expected-config .git/config &&
|
|
find .git/worktrees -print | sort >actual &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
test_expect_success MINGW 'redirect std handles' '
|
|
GIT_REDIRECT_STDOUT=output.txt git rev-parse --git-dir &&
|
|
test .git = "$(cat output.txt)" &&
|
|
test -z "$(GIT_REDIRECT_STDOUT=off git rev-parse --git-dir)" &&
|
|
test_must_fail env \
|
|
GIT_REDIRECT_STDOUT=output.txt \
|
|
GIT_REDIRECT_STDERR="2>&1" \
|
|
git rev-parse --git-dir --verify refs/invalid &&
|
|
printf ".git\nfatal: Needed a single revision\n" >expect &&
|
|
test_cmp expect output.txt
|
|
'
|
|
|
|
test_done
|