mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +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>
This commit is contained in:
parent
43acff34b9
commit
87a074df24
|
@ -463,7 +463,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
|
|||
static char git_dir[PATH_MAX+1];
|
||||
|
||||
setenv(GIT_DIR_ENVIRONMENT,
|
||||
getcwd(git_dir, sizeof(git_dir)), 0);
|
||||
getcwd(git_dir, sizeof(git_dir)), argc > 0);
|
||||
}
|
||||
|
||||
if (init_shared_repository != -1)
|
||||
|
|
|
@ -310,4 +310,18 @@ test_expect_success POSIXPERM 'init notices EPERM' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success 'init creates a new bare directory with global --bare' '
|
||||
rm -rf newdir &&
|
||||
git --bare init newdir &&
|
||||
test -d 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 -d newdir/refs &&
|
||||
! test -d otherdir/refs
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue