On Sat, Mar 26, 2011 at 12:40:58PM -0700, Junio C Hamano wrote:
> Kacper Kornet <kornet@xxxxxxxxxxx> writes:
> > Is there a reason why git clone does not respect GIT_DIR
> > variable.
> Are you sure it does "not respect GIT_DIR"? When you are running clone
> locally, like that:
> > GIT_WORK_TREE=repo GIT_DIR=repo/.git git clone <path>/repo.git
> you have _two_ repositories that the command operates on on your system,
> the one that you are cloning _from_, and the new one that you are
> creating.
> Which repository does your GIT_DIR talk about?
I would expect that GIT_DIR always talks the new one. For example after:
GIT_WORK_TREE=dir GIT_DIR=dir/.git git clone git://git.kernel.org/pub/scm/gitk/gitk
I would expect to have repo in dir/.git. What happens is that in dir
there is a working tree and in local directory gitk there is a bare
repo. The following patch should fix the issue:
diff --git a/builtin/clone.c b/builtin/clone.c
index c6e10bb..082ee53 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -442,11 +442,14 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
die("working tree '%s' already exists.", work_tree);
}
- if (option_bare || work_tree)
- git_dir = xstrdup(dir);
- else {
+ git_dir = getenv("GIT_DIR");
+ if (option_bare || work_tree) {
+ if (!git_dir)
+ git_dir = xstrdup(dir);
+ } else {
work_tree = dir;
- git_dir = xstrdup(mkpath("%s/.git", dir));
+ if (!git_dir)
+ git_dir = xstrdup(mkpath("%s/.git", dir));
}
if (!option_bare) {
--
Kacper
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html