Re: [PATCH] init: handle empty "template" parameter, was Re: fetch refspec foo/* matches foo*
- From
Jeff King <peff@peff.net>
- Date
- Jul 28, 2008, 06:02 UTC
- Message-ID
- <20080728060204.GC7294@sigill.intra.peff.net>
- In-Reply-To
- <alpine.DEB.1.00.0807261511490.26810@eeepc-johanness>
On Sat, Jul 26, 2008 at 03:13:26PM +0200, Johannes Schindelin wrote:
Show 5 quoted lines
> > 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?). > > Again it is in a thread...
Heh. Point taken.
My meaning was "you, Junio, did not see this because it was in another thread, so I am pointing it out to you" but the irony of the rest of the statement was lost on me during the original writing.
> I deem this patch obviously correct, and your reasoning as to what an > empty parameter should mean makes sense.
Thank you for reviewing, anyway. ;)
Here is a re-post with a test for the new behavior added in (and an extra test just to make sure --template works at all. It does get used by test-lib, so we were implicitly checking it to some degree, but it's entirely possible that it could fail and the tests wouldn't necessarily notice (e.g., if it accidentally used an installed set of templates instead)).
-- >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." --- builtin-init-db.c | 2 ++ t/t0001-init.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 28 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] != '/') { diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 2a38d98..620da5b 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -141,4 +141,30 @@ test_expect_success 'reinit' ' test_cmp again/empty again/err2 ' +test_expect_success 'init with --template' ' + mkdir template-source && + echo content >template-source/file && + ( + mkdir template-custom && + cd template-custom && + git init --template=../template-source + ) && + test_cmp template-source/file template-custom/.git/file +' + +test_expect_success 'init with --template (blank)' ' + ( + mkdir template-plain && + cd template-plain && + git init + ) && + test -f template-plain/.git/info/exclude && + ( + mkdir template-blank && + cd template-blank && + git init --template= + ) && + ! test -f template-blank/.git/info/exclude +' + test_done
-- 1.6.0.rc1.155.gd3310