Re: [PATCH] Fix git_setup_directory_gently when GIT_DIR is set
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jun 6, 2006, 01:06 UTC
- Message-ID
- <7vmzcr14ao.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vfyij2mo8.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
Show 17 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > >>> Hmph. Would it be a bug in clone that does not create GIT_DIR >>> then? >> >> I don't think so. The whole point in calling git-init-db is to create >> that. GIT_DIR is set so that the otherwise nice work-in-a-subdirectory >> does not kick in. Imagine for example: >> >> git-clone ./. victim >> >> (taken straight out of t5400). If GIT_DIR was not set, git-init-db (which >> reads repositoryformat from the config if that exists, right?) would find >> .git/ in git/t/trash, and _not_ create git/t/trash/victim/.git/. > > I know clone currently relies on init-db to create the directory if > it does not exist (I wrote the code after all).
Ah, I think I see the real problem is. Alias handling is done too early, and for commands like init-db that does _not_ even want to look at an existing repository it tries to use GIT_DIR.
So how about this patch instead on top of yours?
-- >8 -- git alias: try alias last.
This disables alias "foo" from being used for git-foo, and when we do use alias we check the built-in and then existing command names first and then alias as the fallback. This avoids the problem of common commands used in scripts getting clobbered by user specific aliases.
---
diff --git a/git.c b/git.c index 8854472..6db8f2b 100644 --- a/git.c +++ b/git.c @@ -202,6 +202,7 @@ int main(int argc, const char **argv, ch char *slash = strrchr(cmd, '/'); char git_command[PATH_MAX + 1]; const char *exec_path = NULL; + int done_alias = 0; /* * Take the basename of argv[0] as the command @@ -229,7 +230,6 @@ int main(int argc, const char **argv, ch if (!strncmp(cmd, "git-", 4)) { cmd += 4; argv[0] = cmd; - handle_alias(&argc, &argv); handle_internal_command(argc, argv, envp); die("cannot handle %s internally", cmd); } @@ -287,13 +287,21 @@ int main(int argc, const char **argv, ch exec_path = git_exec_path(); prepend_to_path(exec_path, strlen(exec_path)); - handle_alias(&argc, &argv); + while (1) { + /* See if it's an internal command */ + handle_internal_command(argc, argv, envp); - /* See if it's an internal command */ - handle_internal_command(argc, argv, envp); + /* .. then try the external ones */ + execv_git_cmd(argv); - /* .. then try the external ones */ - execv_git_cmd(argv); + /* It could be an alias -- this works around the insanity + * of overriding "git log" with "git show" by having + * alias.log = show + */ + if (done_alias || !handle_alias(&argc, &argv)) + break; + done_alias = 1; + } if (errno == ENOENT) cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);