Merge branch 'maint'

* maint:
  handle "git --bare init <dir>" properly
This commit is contained in:
Junio C Hamano 2010-05-10 18:34:03 -07:00
commit d92f844610
2 changed files with 15 additions and 1 deletions

View file

@ -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)

View file

@ -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