Let git-clone to pass --template=dir option to git-init-db.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b333f510454fff9dc6828b62ca8a0b0dc4c116f6..94d93933721274be4b5c4e3f5694593ec74fd22c 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -9,8 +9,8 @@ git-clone - Clones a repository
 SYNOPSIS
 --------
 [verse]
 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
          <repository> [<directory>]
 
 DESCRIPTION


@@ -89,6 +89,11 @@ OPTIONS
        the command to specify non-default path for the command
        run on the other end.
 
        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.
 <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 d96894d4c2aa6e6c0aa38ca0755ffa16ace2161c..de59904d56155faecedbd7cd4818a741dde43ffd 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -9,7 +9,7 @@
 unset CDPATH
 
 usage() {
 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
 }
 
        exit 1
 }
 


@@ -102,6 +102,7 @@ quiet=
 local=no
 use_local=no
 local_shared=no
 local=no
 use_local=no
 local_shared=no

+unset template

 no_checkout=
 upload_pack=
 bare=
 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 ;;
        *,-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 ;;
        *,-q|*,--quiet) quiet=-q ;;
        *,--use-separate-remote)
                use_separate_remote=t ;;


@@ -203,7 +209,7 @@ trap 'err=$?; cd ..; rm -r "$D"; exit $err' 0
 case "$bare" in
 yes) GIT_DIR="$D" ;;
 *) GIT_DIR="$D/.git" ;;
 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" ;;
 case "$bare" in
 yes)
        GIT_DIR="$D" ;;