diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-10 18:34:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 18:34:03 -0700 |
| commit | d92f84461033b6ca3e19e31d30e5524bd25346ee (patch) | |
| tree | 02168f21f10b22b5625a11ca1ec09aee9addc87a | |
| parent | 73d419558d9fa4de3be28bd58158636bc739808e (diff) | |
| parent | 87a074df2455f305df8facc22e85dac1cfeb0d6b (diff) | |
| download | git-d92f84461033b6ca3e19e31d30e5524bd25346ee.tar.gz | |
Merge branch 'maint'
* maint:
handle "git --bare init <dir>" properly
| -rw-r--r-- | builtin/init-db.c | 2 | ||||
| -rwxr-xr-x | t/t0001-init.sh | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index edc40ff574..0271285fad 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -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) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 675773479a..7c0a698b92 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -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 |