2007-08-27 07:58:06 +00:00
|
|
|
#!/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
|
2014-11-18 13:50:24 +00:00
|
|
|
|
|
|
|
if test_have_prereq POSIXPERM && test -x "$1/config"
|
|
|
|
then
|
|
|
|
echo "$1/config is executable?"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
2014-03-20 23:15:24 +00:00
|
|
|
bare=$(cd "$1" && git config --bool core.bare)
|
|
|
|
worktree=$(cd "$1" && git config core.worktree) ||
|
2007-08-27 07:58:06 +00:00
|
|
|
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' '
|
2014-03-20 23:23:06 +00:00
|
|
|
git init plain &&
|
2007-08-27 07:58:06 +00:00
|
|
|
check_config plain/.git false unset
|
|
|
|
'
|
|
|
|
|
2010-11-26 15:32:41 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2014-06-08 09:37:10 +00:00
|
|
|
test_expect_success 'plain nested through aliased command' '
|
2010-11-26 15:32:41 +00:00
|
|
|
(
|
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2014-06-08 09:37:10 +00:00
|
|
|
test_expect_success 'plain nested in bare through aliased command' '
|
2010-11-26 15:32:41 +00:00
|
|
|
(
|
|
|
|
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
|
2007-08-27 07:58:06 +00:00
|
|
|
'
|
|
|
|
|
2015-12-20 07:50:19 +00:00
|
|
|
test_expect_success 'No extra GIT_* on alias scripts' '
|
2016-03-03 06:55:17 +00:00
|
|
|
write_script script <<-\EOF &&
|
|
|
|
env |
|
|
|
|
sed -n \
|
|
|
|
-e "/^GIT_PREFIX=/d" \
|
|
|
|
-e "/^GIT_TEXTDOMAINDIR=/d" \
|
|
|
|
-e "/^GIT_/s/=.*//p" |
|
|
|
|
sort
|
2015-12-20 07:50:19 +00:00
|
|
|
EOF
|
2016-03-03 06:55:17 +00:00
|
|
|
./script >expected &&
|
2015-12-20 07:50:19 +00:00
|
|
|
git config alias.script \!./script &&
|
2016-03-03 06:55:17 +00:00
|
|
|
( mkdir sub && cd sub && git script >../actual ) &&
|
2015-12-20 07:50:19 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2007-08-27 07:58:06 +00:00
|
|
|
test_expect_success 'plain with GIT_WORK_TREE' '
|
2014-03-20 23:19:50 +00:00
|
|
|
mkdir plain-wt &&
|
|
|
|
test_must_fail env GIT_WORK_TREE="$(pwd)/plain-wt" git init plain-wt
|
2007-08-27 07:58:06 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'plain bare' '
|
2014-03-20 23:23:06 +00:00
|
|
|
git --bare init plain-bare-1 &&
|
2007-08-27 07:58:06 +00:00
|
|
|
check_config plain-bare-1 true unset
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'plain bare with GIT_WORK_TREE' '
|
2014-03-20 23:19:50 +00:00
|
|
|
mkdir plain-bare-2 &&
|
|
|
|
test_must_fail \
|
|
|
|
env GIT_WORK_TREE="$(pwd)/plain-bare-2" \
|
|
|
|
git --bare init plain-bare-2
|
2007-08-27 07:58:06 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'GIT_DIR bare' '
|
2014-03-20 23:21:25 +00:00
|
|
|
mkdir git-dir-bare.git &&
|
|
|
|
GIT_DIR=git-dir-bare.git git init &&
|
2007-08-27 07:58:06 +00:00
|
|
|
check_config git-dir-bare.git true unset
|
|
|
|
'
|
|
|
|
|
2008-05-28 18:53:57 +00:00
|
|
|
test_expect_success 'init --bare' '
|
2014-03-20 23:23:06 +00:00
|
|
|
git init --bare init-bare.git &&
|
2008-07-11 00:12:03 +00:00
|
|
|
check_config init-bare.git true unset
|
2008-05-28 18:53:57 +00:00
|
|
|
'
|
|
|
|
|
2007-08-27 07:58:06 +00:00
|
|
|
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)' '
|
2014-03-20 23:19:50 +00:00
|
|
|
mkdir git-dir-wt-2.git &&
|
|
|
|
test_must_fail env \
|
|
|
|
GIT_WORK_TREE="$(pwd)" \
|
|
|
|
GIT_DIR=git-dir-wt-2.git \
|
|
|
|
git --bare init
|
2007-08-27 07:58:06 +00:00
|
|
|
'
|
|
|
|
|
2011-04-12 22:57:08 +00:00
|
|
|
test_expect_success 'reinit' '
|
2008-03-24 15:14:52 +00:00
|
|
|
|
|
|
|
(
|
|
|
|
mkdir again &&
|
|
|
|
cd again &&
|
|
|
|
git init >out1 2>err1 &&
|
|
|
|
git init >out2 2>err2
|
|
|
|
) &&
|
2011-04-12 22:57:08 +00:00
|
|
|
test_i18ngrep "Initialized empty" again/out1 &&
|
|
|
|
test_i18ngrep "Reinitialized existing" again/out2 &&
|
2008-03-24 15:14:52 +00:00
|
|
|
>again/empty &&
|
2011-04-12 22:57:08 +00:00
|
|
|
test_i18ncmp again/empty again/err1 &&
|
|
|
|
test_i18ncmp again/empty again/err2
|
2008-03-24 15:14:52 +00:00
|
|
|
'
|
|
|
|
|
2008-07-28 06:02:04 +00:00
|
|
|
test_expect_success 'init with --template' '
|
|
|
|
mkdir template-source &&
|
|
|
|
echo content >template-source/file &&
|
2014-03-20 23:23:06 +00:00
|
|
|
git init --template=../template-source template-custom &&
|
2008-07-28 06:02:04 +00:00
|
|
|
test_cmp template-source/file template-custom/.git/file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init with --template (blank)' '
|
2014-03-20 23:23:06 +00:00
|
|
|
git init template-plain &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_file template-plain/.git/info/exclude &&
|
2014-03-20 23:23:06 +00:00
|
|
|
git init --template= template-blank &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_missing template-blank/.git/info/exclude
|
2008-07-28 06:02:04 +00:00
|
|
|
'
|
|
|
|
|
2010-02-26 04:00:21 +00:00
|
|
|
test_expect_success 'init with init.templatedir set' '
|
|
|
|
mkdir templatedir-source &&
|
|
|
|
echo Content >templatedir-source/file &&
|
2014-03-20 23:18:12 +00:00
|
|
|
test_config_global init.templatedir "${HOME}/templatedir-source" &&
|
2010-02-26 04:00:21 +00:00
|
|
|
(
|
|
|
|
mkdir templatedir-set &&
|
|
|
|
cd templatedir-set &&
|
2010-10-03 20:00:14 +00:00
|
|
|
sane_unset GIT_TEMPLATE_DIR &&
|
2010-02-26 04:00:21 +00:00
|
|
|
NO_SET_GIT_TEMPLATE_DIR=t &&
|
|
|
|
export NO_SET_GIT_TEMPLATE_DIR &&
|
|
|
|
git init
|
|
|
|
) &&
|
|
|
|
test_cmp templatedir-source/file templatedir-set/.git/file
|
|
|
|
'
|
|
|
|
|
git init: --bare/--shared overrides system/global config
If core.bare or core.sharedRepository are set in /etc/gitconfig or
~/.gitconfig, then 'git init' will read the values when constructing a
new config file; reading them, however, will override the values
specified on the command line. In the case of --bare, this ends up
causing a segfault, without the repository being properly initialised;
in the case of --shared, the permissions are set according to the
existing config settings, not what was specified on the command line.
This fix saves any specified values for --bare and --shared prior to
reading existing config settings, and restores them after reading but
before writing the new config file. core.bare is ignored in all
situations, while core.sharedRepository will only be used if --shared
is not specified to git init.
Also includes testcases which use a specified global config file
override, demonstrating the former failure scenario.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-07 05:37:48 +00:00
|
|
|
test_expect_success 'init --bare/--shared overrides system/global config' '
|
2014-03-20 23:18:12 +00:00
|
|
|
test_config_global core.bare false &&
|
|
|
|
test_config_global core.sharedRepository 0640 &&
|
2014-03-20 23:23:06 +00:00
|
|
|
git init --bare --shared=0666 init-bare-shared-override &&
|
git init: --bare/--shared overrides system/global config
If core.bare or core.sharedRepository are set in /etc/gitconfig or
~/.gitconfig, then 'git init' will read the values when constructing a
new config file; reading them, however, will override the values
specified on the command line. In the case of --bare, this ends up
causing a segfault, without the repository being properly initialised;
in the case of --shared, the permissions are set according to the
existing config settings, not what was specified on the command line.
This fix saves any specified values for --bare and --shared prior to
reading existing config settings, and restores them after reading but
before writing the new config file. core.bare is ignored in all
situations, while core.sharedRepository will only be used if --shared
is not specified to git init.
Also includes testcases which use a specified global config file
override, demonstrating the former failure scenario.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-07 05:37:48 +00:00
|
|
|
check_config init-bare-shared-override true unset &&
|
|
|
|
test x0666 = \
|
2014-04-28 12:57:24 +00:00
|
|
|
x$(git config -f init-bare-shared-override/config core.sharedRepository)
|
git init: --bare/--shared overrides system/global config
If core.bare or core.sharedRepository are set in /etc/gitconfig or
~/.gitconfig, then 'git init' will read the values when constructing a
new config file; reading them, however, will override the values
specified on the command line. In the case of --bare, this ends up
causing a segfault, without the repository being properly initialised;
in the case of --shared, the permissions are set according to the
existing config settings, not what was specified on the command line.
This fix saves any specified values for --bare and --shared prior to
reading existing config settings, and restores them after reading but
before writing the new config file. core.bare is ignored in all
situations, while core.sharedRepository will only be used if --shared
is not specified to git init.
Also includes testcases which use a specified global config file
override, demonstrating the former failure scenario.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-07 05:37:48 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init honors global core.sharedRepository' '
|
2014-03-20 23:18:12 +00:00
|
|
|
test_config_global core.sharedRepository 0666 &&
|
2014-03-20 23:23:06 +00:00
|
|
|
git init shared-honor-global &&
|
git init: --bare/--shared overrides system/global config
If core.bare or core.sharedRepository are set in /etc/gitconfig or
~/.gitconfig, then 'git init' will read the values when constructing a
new config file; reading them, however, will override the values
specified on the command line. In the case of --bare, this ends up
causing a segfault, without the repository being properly initialised;
in the case of --shared, the permissions are set according to the
existing config settings, not what was specified on the command line.
This fix saves any specified values for --bare and --shared prior to
reading existing config settings, and restores them after reading but
before writing the new config file. core.bare is ignored in all
situations, while core.sharedRepository will only be used if --shared
is not specified to git init.
Also includes testcases which use a specified global config file
override, demonstrating the former failure scenario.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-07 05:37:48 +00:00
|
|
|
test x0666 = \
|
2014-04-28 12:57:24 +00:00
|
|
|
x$(git config -f shared-honor-global/.git/config core.sharedRepository)
|
git init: --bare/--shared overrides system/global config
If core.bare or core.sharedRepository are set in /etc/gitconfig or
~/.gitconfig, then 'git init' will read the values when constructing a
new config file; reading them, however, will override the values
specified on the command line. In the case of --bare, this ends up
causing a segfault, without the repository being properly initialised;
in the case of --shared, the permissions are set according to the
existing config settings, not what was specified on the command line.
This fix saves any specified values for --bare and --shared prior to
reading existing config settings, and restores them after reading but
before writing the new config file. core.bare is ignored in all
situations, while core.sharedRepository will only be used if --shared
is not specified to git init.
Also includes testcases which use a specified global config file
override, demonstrating the former failure scenario.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-07 05:37:48 +00:00
|
|
|
'
|
|
|
|
|
2015-10-05 03:46:04 +00:00
|
|
|
test_expect_success 'init allows insanely long --template' '
|
|
|
|
git init --template=$(printf "x%09999dx" 1) test
|
2009-04-18 14:14:02 +00:00
|
|
|
'
|
|
|
|
|
2009-07-24 21:59:28 +00:00
|
|
|
test_expect_success 'init creates a new directory' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
git init newdir &&
|
|
|
|
test_path_is_dir newdir/.git/refs
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init creates a new bare directory' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
git init --bare newdir &&
|
|
|
|
test_path_is_dir newdir/refs
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init recreates a directory' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
mkdir newdir &&
|
|
|
|
git init newdir &&
|
|
|
|
test_path_is_dir newdir/.git/refs
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init recreates a new bare directory' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
mkdir newdir &&
|
|
|
|
git init --bare newdir &&
|
|
|
|
test_path_is_dir newdir/refs
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init creates a new deep directory' '
|
2009-08-09 16:02:55 +00:00
|
|
|
rm -fr newdir &&
|
|
|
|
git init newdir/a/b/c &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir newdir/a/b/c/.git/refs
|
2009-08-09 16:02:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shared)' '
|
2009-07-24 21:59:28 +00:00
|
|
|
rm -fr newdir &&
|
|
|
|
(
|
|
|
|
# Leading directories should honor umask while
|
|
|
|
# the repository itself should follow "shared"
|
|
|
|
umask 002 &&
|
|
|
|
git init --bare --shared=0660 newdir/a/b/c &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir newdir/a/b/c/refs &&
|
2009-07-24 21:59:28 +00:00
|
|
|
ls -ld newdir/a newdir/a/b > lsab.out &&
|
2009-08-09 15:38:04 +00:00
|
|
|
! grep -v "^drwxrw[sx]r-x" lsab.out &&
|
2009-07-24 21:59:28 +00:00
|
|
|
ls -ld newdir/a/b/c > lsc.out &&
|
|
|
|
! grep -v "^drwxrw[sx]---" lsc.out
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init notices EEXIST (1)' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
>newdir &&
|
|
|
|
test_must_fail git init newdir &&
|
|
|
|
test_path_is_file newdir
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init notices EEXIST (2)' '
|
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
mkdir newdir &&
|
|
|
|
>newdir/a &&
|
|
|
|
test_must_fail git init newdir/a/b &&
|
|
|
|
test_path_is_file newdir/a
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
2010-08-06 22:09:09 +00:00
|
|
|
test_expect_success POSIXPERM,SANITY 'init notices EPERM' '
|
2009-07-24 21:59:28 +00:00
|
|
|
rm -fr newdir &&
|
2014-03-20 23:21:25 +00:00
|
|
|
mkdir newdir &&
|
|
|
|
chmod -w newdir &&
|
|
|
|
test_must_fail git init newdir/a/b
|
2009-07-24 21:59:28 +00:00
|
|
|
'
|
|
|
|
|
handle "git --bare init <dir>" properly
If we know we are creating a bare repository, we use setenv
to set the GIT_DIR directory to the current directory
(either where we already were, or one we created and chdir'd
into with "git init --bare <dir>").
However, with "git --bare init <dir>" (note the --bare as a
git wrapper option), the setup code actually sets GIT_DIR
for us, but it uses the wrong, original cwd when a directory
is given. Because our setenv does not use the overwrite
flag, it is ignored.
We need to set the overwrite flag, but only when we are
given a directory on the command line. That still allows:
GIT_DIR=foo.git git init --bare
to work. The behavior is changed for:
GIT_DIR=foo.git git init --bare bar.git
which used to create the repository in foo.git, but now will
use bar.git. This is more sane, as command line options
should generally override the environment.
Noticed by Oliver Hoffmann.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-10 09:42:06 +00:00
|
|
|
test_expect_success 'init creates a new bare directory with global --bare' '
|
|
|
|
rm -rf newdir &&
|
|
|
|
git --bare init newdir &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir newdir/refs
|
handle "git --bare init <dir>" properly
If we know we are creating a bare repository, we use setenv
to set the GIT_DIR directory to the current directory
(either where we already were, or one we created and chdir'd
into with "git init --bare <dir>").
However, with "git --bare init <dir>" (note the --bare as a
git wrapper option), the setup code actually sets GIT_DIR
for us, but it uses the wrong, original cwd when a directory
is given. Because our setenv does not use the overwrite
flag, it is ignored.
We need to set the overwrite flag, but only when we are
given a directory on the command line. That still allows:
GIT_DIR=foo.git git init --bare
to work. The behavior is changed for:
GIT_DIR=foo.git git init --bare bar.git
which used to create the repository in foo.git, but now will
use bar.git. This is more sane, as command line options
should generally override the environment.
Noticed by Oliver Hoffmann.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-10 09:42:06 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init prefers command line to GIT_DIR' '
|
|
|
|
rm -rf newdir &&
|
|
|
|
mkdir otherdir &&
|
|
|
|
GIT_DIR=otherdir git --bare init newdir &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir newdir/refs &&
|
|
|
|
test_path_is_missing otherdir/refs
|
handle "git --bare init <dir>" properly
If we know we are creating a bare repository, we use setenv
to set the GIT_DIR directory to the current directory
(either where we already were, or one we created and chdir'd
into with "git init --bare <dir>").
However, with "git --bare init <dir>" (note the --bare as a
git wrapper option), the setup code actually sets GIT_DIR
for us, but it uses the wrong, original cwd when a directory
is given. Because our setenv does not use the overwrite
flag, it is ignored.
We need to set the overwrite flag, but only when we are
given a directory on the command line. That still allows:
GIT_DIR=foo.git git init --bare
to work. The behavior is changed for:
GIT_DIR=foo.git git init --bare bar.git
which used to create the repository in foo.git, but now will
use bar.git. This is more sane, as command line options
should generally override the environment.
Noticed by Oliver Hoffmann.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-10 09:42:06 +00:00
|
|
|
'
|
|
|
|
|
2011-03-19 15:16:56 +00:00
|
|
|
test_expect_success 'init with separate gitdir' '
|
|
|
|
rm -rf newdir &&
|
|
|
|
git init --separate-git-dir realgitdir newdir &&
|
2014-04-28 12:57:24 +00:00
|
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
2011-03-19 15:16:56 +00:00
|
|
|
test_cmp expected newdir/.git &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir realgitdir/refs
|
2011-03-19 15:16:56 +00:00
|
|
|
'
|
|
|
|
|
2013-08-31 01:04:14 +00:00
|
|
|
test_expect_success 're-init on .git file' '
|
|
|
|
( cd newdir && git init )
|
|
|
|
'
|
|
|
|
|
2011-03-19 15:16:56 +00:00
|
|
|
test_expect_success 're-init to update git link' '
|
|
|
|
(
|
|
|
|
cd newdir &&
|
|
|
|
git init --separate-git-dir ../surrealgitdir
|
|
|
|
) &&
|
2014-04-28 12:57:24 +00:00
|
|
|
echo "gitdir: $(pwd)/surrealgitdir" >expected &&
|
2011-03-19 15:16:56 +00:00
|
|
|
test_cmp expected newdir/.git &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir surrealgitdir/refs &&
|
|
|
|
test_path_is_missing realgitdir/refs
|
2011-03-19 15:16:56 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 're-init to move gitdir' '
|
|
|
|
rm -rf newdir realgitdir surrealgitdir &&
|
|
|
|
git init newdir &&
|
|
|
|
(
|
|
|
|
cd newdir &&
|
|
|
|
git init --separate-git-dir ../realgitdir
|
|
|
|
) &&
|
2014-04-28 12:57:24 +00:00
|
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
2011-03-19 15:16:56 +00:00
|
|
|
test_cmp expected newdir/.git &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir realgitdir/refs
|
2011-03-19 15:16:56 +00:00
|
|
|
'
|
|
|
|
|
2011-04-12 06:30:49 +00:00
|
|
|
test_expect_success SYMLINKS 're-init to move gitdir symlink' '
|
2011-03-19 15:16:56 +00:00
|
|
|
rm -rf newdir realgitdir &&
|
|
|
|
git init newdir &&
|
|
|
|
(
|
|
|
|
cd newdir &&
|
|
|
|
mv .git here &&
|
|
|
|
ln -s here .git &&
|
2011-05-24 16:40:32 +00:00
|
|
|
git init --separate-git-dir ../realgitdir
|
2011-03-19 15:16:56 +00:00
|
|
|
) &&
|
2014-04-28 12:57:24 +00:00
|
|
|
echo "gitdir: $(pwd)/realgitdir" >expected &&
|
2011-03-19 15:16:56 +00:00
|
|
|
test_cmp expected newdir/.git &&
|
2014-03-20 23:17:15 +00:00
|
|
|
test_cmp expected newdir/here &&
|
2014-03-20 23:17:35 +00:00
|
|
|
test_path_is_dir realgitdir/refs
|
2011-03-19 15:16:56 +00:00
|
|
|
'
|
|
|
|
|
mingw: introduce the 'core.hideDotFiles' setting
On Unix (and Linux), files and directories whose names start with a dot
are usually not shown by default. This convention is used by Git: the
.git/ directory should be left alone by regular users, and only accessed
through Git itself.
On Windows, no such convention exists. Instead, there is an explicit flag
to mark files or directories as hidden.
In the early days, Git for Windows did not mark the .git/ directory (or
for that matter, any file or directory whose name starts with a dot)
hidden. This lead to quite a bit of confusion, and even loss of data.
Consequently, Git for Windows introduced the core.hideDotFiles setting,
with three possible values: true, false, and dotGitOnly, defaulting to
marking only the .git/ directory as hidden.
The rationale: users do not need to access .git/ directly, and indeed (as
was demonstrated) should not really see that directory, either. However,
not all dot files should be hidden by default, as e.g. Eclipse does not
show them (and the user would therefore be unable to see, say, a
.gitattributes file).
In over five years since the last attempt to bring this patch into core
Git, a slightly buggy version of this patch has served Git for Windows'
users well: no single report indicated problems with the hidden .git/
directory, and the stream of problems caused by the previously non-hidden
.git/ directory simply stopped. The bugs have been fixed during the
process of getting this patch upstream.
Note that there is a funny quirk we have to pay attention to when
creating hidden files: we use Win32's _wopen() function which
transmogrifies its arguments and hands off to Win32's CreateFile()
function. That latter function errors out with ERROR_ACCESS_DENIED (the
equivalent of EACCES) when the equivalent of the O_CREAT flag was passed
and the file attributes (including the hidden flag) do not match an
existing file's. And _wopen() accepts no parameter that would be
transmogrified into said hidden flag. Therefore, we simply try again
without O_CREAT.
A slightly different method is required for our fopen()/freopen()
function as we cannot even *remove* the implicit O_CREAT flag.
Therefore, we briefly mark existing files as unhidden when opening them
via fopen()/freopen().
The ERROR_ACCESS_DENIED error can also be triggered by opening a file
that is marked as a system file (which is unlikely to be tracked in
Git), and by trying to create a file that has *just* been deleted and is
awaiting the last open handles to be released (which would be handled
better by the "Try again?" logic, a story for a different patch series,
though). In both cases, it does not matter much if we try again without
the O_CREAT flag, read: it does not hurt, either.
For details how ERROR_ACCESS_DENIED can be triggered, see
https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858
Original-patch-by: Erik Faye-Lund <kusmabite@gmail.com>
Initial-Test-By: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-11 08:43:37 +00:00
|
|
|
# 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 &&
|
|
|
|
(
|
|
|
|
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 &&
|
|
|
|
(
|
|
|
|
unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
|
|
|
|
mkdir newdir &&
|
|
|
|
cd newdir &&
|
|
|
|
git --bare init
|
|
|
|
) &&
|
|
|
|
! is_hidden newdir
|
|
|
|
'
|
|
|
|
|
2007-08-27 07:58:06 +00:00
|
|
|
test_done
|