Commit 84054f79 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

clone: accept config options on the command line

Clone does all of init, "remote add", fetch, and checkout
without giving the user a chance to intervene and set any
configuration. This patch allows you to set config options
in the newly created repository after the clone, but before
we do any other operations.

In many cases, this is a minor convenience over something

  git clone git://...
  git config core.whatever true

But in some cases, it can bring extra efficiency by changing
how the fetch or checkout work. For example, setting
line-ending config before the checkout avoids having to
re-checkout all of the contents with the correct line

It also provides a mechanism for passing information to remote
helpers during a clone; the helpers may read the git config
to influence how they operate.
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 2496844b
......@@ -159,6 +159,17 @@ objects from the source repository into a pack in the cloned repository.
Specify the directory from which templates will be used;
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
--config <key>=<value>::
-c <key>=<value>::
Set a configuration variable in the newly-created repository;
this takes effect immediately after the repository is
initialized, but before the remote history is fetched or any
files checked out. The key is in the same format as expected by
linkgit:git-config[1] (e.g., `core.eol=true`). If multiple
values are given for the same key, each value will be written to
the config file. This makes it safe, for example, to add
additional fetch refspecs to the origin remote.
--depth <depth>::
Create a 'shallow' clone with a history truncated to the
specified number of revisions. A shallow repository has a
......@@ -46,6 +46,7 @@ static const char *real_git_dir;
static char *option_upload_pack = "git-upload-pack";
static int option_verbosity;
static int option_progress;
static struct string_list option_config;
static struct option builtin_clone_options[] = {
......@@ -83,7 +84,8 @@ static struct option builtin_clone_options[] = {
"create a shallow clone of that depth"),
OPT_STRING(0, "separate-git-dir", &real_git_dir, "gitdir",
"separate git dir from working tree"),
OPT_STRING_LIST('c', "config", &option_config, "key=value",
"set config inside the new repository"),
......@@ -364,6 +366,22 @@ static void write_remote_refs(const struct ref *local_refs)
static int write_one_config(const char *key, const char *value, void *data)
return git_config_set_multivar(key, value ? value : "true", "^$", 0);
static void write_config(struct string_list *config)
int i;
for (i = 0; i < config->nr; i++) {
if (git_config_parse_parameter(config->items[i].string,
write_one_config, NULL) < 0)
die("unable to write parameters to config file");
int cmd_clone(int argc, const char **argv, const char *prefix)
int is_bundle = 0, is_local;
......@@ -482,6 +500,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
printf(_("Cloning into %s...\n"), dir);
init_db(option_template, INIT_DB_QUIET);
* At this point, the config exists, so we do not need the
test_description='tests for git clone -c key=value'
. ./
test_expect_success 'clone -c sets config in cloned repo' '
rm -rf child &&
git clone -c . child &&
echo bar >expect &&
git --git-dir=child/.git config >actual &&
test_cmp expect actual
test_expect_success 'clone -c can set multi-keys' '
rm -rf child &&
git clone -c -c . child &&
{ echo bar; echo baz; } >expect &&
git --git-dir=child/.git config --get-all >actual &&
test_cmp expect actual
test_expect_success 'clone -c without a value is boolean true' '
rm -rf child &&
git clone -c . child &&
echo true >expect &&
git --git-dir=child/.git config --bool >actual &&
test_cmp expect actual
test_expect_success 'clone -c config is available during clone' '
echo content >file &&
git add file &&
git commit -m one &&
rm -rf child &&
git clone -c core.autocrlf . child &&
printf "content\\r\\n" >expect &&
test_cmp expect child/file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment