Re: fetch refspec foo/* matches foo*
- From
Jeff King <peff@peff.net>
- Date
- Jul 26, 2008, 08:33 UTC
- Message-ID
- <20080726083356.GB10104@sigill.intra.peff.net>
- In-Reply-To
- <20080726082405.GA10104@sigill.intra.peff.net>
On Sat, Jul 26, 2008 at 04:24:05AM -0400, Jeff King wrote:
Show 7 quoted lines
> > If not, I think I probably need to take a look at this, reproducing and > > possibly fixing, before applying non-fix patches. > > I have been meaning to look at it for days, so I finally took a peek. I > was able to reproduce the problem easily. I think it is (almost) as > simple as the patch below. In the refspec parsing, we already require > globs to come after '/', so this is the analagous check during match.
Also, while I have your attention, Junio, here is another bug fix that should go into 1.6.0. I posted the patch as a "how about this" deep in a thread and got no response (which means no complaints, right?).
-- >8 -- init: handle empty "template" parameter
If a user passes "--template=", then our template parameter is blank. Unfortunately, copy_templates() assumes it has at least one character, and does all sorts of bad things like reading from template[-1] and then proceeding to link all of '/' into the .git directory.
This patch just checks for that condition in copy_templates and aborts. As a side effect, this means that --template= now has the meaning "don't copy any templates." --- I don't really care about the "side effect" behavior, but it seems reasonable. The other obvious option is to simply die(). Certainly either is better than the current bug.
builtin-init-db.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/builtin-init-db.c b/builtin-init-db.c index 38b4fcb..baf0d09 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -117,6 +117,8 @@ static void copy_templates(const char *template_dir) template_dir = getenv(TEMPLATE_DIR_ENVIRONMENT); if (!template_dir) template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR); + if (!template_dir[0]) + return; strcpy(template_path, template_dir); template_len = strlen(template_path); if (template_path[template_len-1] != '/') {
-- 1.6.0.rc0.233.gb3fd2