diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-08-27 00:58:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-08-27 22:36:43 -0700 |
commit | 6adcca3fe84e6859fc62df6c4ab916192ca02795 (patch) | |
tree | cbe1f3262b88759927ac07e3980fa8b590679b47 /git.c | |
parent | ac076c29ae8d57b72abe27f573061ea7b2eeed57 (diff) | |
download | git-6adcca3fe84e6859fc62df6c4ab916192ca02795.tar.gz |
Fix initialization of a bare repository
Here is my attempt to fix this with a minimally intrusive patch.
* As "git --bare init" cannot tell if it was called with --bare or
just "GIT_DIR=. git init", I added an explicit assignment of
is_bare_repository_cfg on the codepath for "git --bare".
* GIT_WORK_TREE alone without GIT_DIR does not make any sense,
nor GIT_WORK_TREE with an explicit "git --bare". Catch that
mistake. It might make sense to move this check to "git.c"
side as well, but I tried to shoot for the minimum change for
now.
* Some scripts, especially from the olden days, rely on
traditional GIT_DIR behaviour in "git init". Namely, these
are some notable patterns:
(create a bare repository)
- mkdir some.git && cd some.git && GIT_DIR=. git init
- mkdir some.git && cd some.git && git --bare init
(create a non-bare repository)
- mkdir .git && GIT_DIR=.git git init
- mkdir .git && GIT_DIR=`pwd`/.git git init
This comes with a new test script and also passes the existing
test suite, but there may be cases that are still broken with
the current tip of master and this patch does not yet fix. I'd
appreciate help in straightening this mess out.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -93,6 +93,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged) *envchanged = 1; } else if (!strcmp(cmd, "--bare")) { static char git_dir[PATH_MAX+1]; + is_bare_repository_cfg = 1; setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 1); if (envchanged) *envchanged = 1; |