Re: [PATCH] new environment variable GIT_TEMPLATE_DIR to override default template
Matthias Lederhofer <matled@gmx.net> writes:
Show 7 quoted lines
> directory and --template=<template_directory> option for to git-clone
>
> ---
>> Please document such changes, in the spirit of
>
> That's right, here are both patches in one because the second patch
> would also change the documentation of the first one.
Thanks.
* Please don't put the beginning of one sentence on Subject
line and start the body of the message with the rest of that
sentence. Instead, come up with a short (meaning "fits on
the Subject line without wrapping with 80-column terminal")
title that describes what the patch does -- it is a good
sanity check to make sure your patch is doing one thing and
one thing only, instead of mixing unrelated mess together.
* Please sign-off your patch.
* Please test your patch for existing usage, not just for the
new usage you added, to avoid regressions.
I like the part to let git-clone pass --template down to git-init-db, but once it is in place I doubt you would still need GIT_TEMPLATE_DIR. I'd rather not to introduce new environment variables if we can avoid them.
Show 21 quoted lines
> diff --git a/git-clone.sh b/git-clone.sh
> index d96894d..1c7ae12 100755
> --- a/git-clone.sh
> +++ b/git-clone.sh
> @@ -102,6 +102,7 @@ quiet=
> local=no
> use_local=no
> local_shared=no
> +template=
> no_checkout=
> upload_pack=
> bare=
> @@ -120,6 +121,8 @@ while
> *,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
> *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
> local_shared=yes; use_local=yes ;;
> + *,--template=*)
> + template="$1" ;;
> *,-q|*,--quiet) quiet=-q ;;
> *,--use-separate-remote)
> use_separate_remote=t ;;
Here, $template is either empty string "", or "--template=dir" after argument parsing. But then it does this:
Show 6 quoted lines
> @@ -203,7 +206,7 @@ trap 'err=$?; cd ..; rm -r "$D"; exit $e
> case "$bare" in
> yes) GIT_DIR="$D" ;;
> *) GIT_DIR="$D/.git" ;;
> -esac && export GIT_DIR && git-init-db || usage
> +esac && export GIT_DIR && git-init-db "$template" || usage
which I suspect would make git-init-db barf if you did not pass any --template=foo option to git-clone. Did you test your patch?
So I'd do it like this instead.
-- >8 -- [PATCH] Let git-clone to pass --template=dir option to git-init-db.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
Documentation/git-clone.txt | 9 +++++++--
git-clone.sh | 10 ++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
Show changes to 2 files +15 −4
Documentation/git-clone.txt, git-clone.sh
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b333f51..94d9393 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -9,8 +9,8 @@ git-clone - Clones a repository
SYNOPSIS
--------
[verse]
-'git-clone' [-l [-s]] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>]
- [--reference <repository>]
+'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
+ [-o <name>] [-u <upload-pack>] [--reference <repository>]
<repository> [<directory>]
DESCRIPTION
@@ -89,6 +89,11 @@ OPTIONS
the command to specify non-default path for the command
run on the other end.
+--template=<template_directory>::
+ Specify the directory from which templates will be used;
+ if unset the templates are taken from the installation
+ defined default, typically `/usr/share/git-core/templates`.
+
<repository>::
The (possibly remote) repository to clone from. It can
be any URL git-fetch supports.
diff --git a/git-clone.sh b/git-clone.sh
index d96894d..de59904 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -9,7 +9,7 @@ # See git-sh-setup why.
unset CDPATH
usage() {
- echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
+ echo >&2 "Usage: $0 [--template=<template_directory>] [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
exit 1
}
@@ -102,6 +102,7 @@ quiet=
local=no
use_local=no
local_shared=no
+unset template
no_checkout=
upload_pack=
bare=
@@ -120,6 +121,11 @@ while
*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
*,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
local_shared=yes; use_local=yes ;;
+ 1,--template) usage ;;
+ *,--template)
+ shift; template="--template=$1" ;;
+ *,--template=*)
+ template="$1" ;;
*,-q|*,--quiet) quiet=-q ;;
*,--use-separate-remote)
use_separate_remote=t ;;
@@ -203,7 +209,7 @@ trap 'err=$?; cd ..; rm -r "$D"; exit $e
case "$bare" in
yes) GIT_DIR="$D" ;;
*) GIT_DIR="$D/.git" ;;
-esac && export GIT_DIR && git-init-db || usage
+esac && export GIT_DIR && git-init-db ${template+"$template"} || usage
case "$bare" in
yes)
GIT_DIR="$D" ;;
--
1.3.3.g2a0a
Petr Baudis