Skip to content

Commit

Permalink
Merge branch 'jn/clone-add-empty-config-from-command-line'
Browse files Browse the repository at this point in the history
"git clone --config var=val" is a way to populate the
per-repository configuration file of the new repository, but it did
not work well when val is an empty string.  This has been fixed.

* jn/clone-add-empty-config-from-command-line:
  clone: handle empty config values in -c
  • Loading branch information
gitster committed May 16, 2017
2 parents 4875663 + db4eca1 commit 883247c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 3 additions & 1 deletion builtin/clone.c
Expand Up @@ -776,7 +776,9 @@ static int checkout(int submodule_progress)

static int write_one_config(const char *key, const char *value, void *data)
{
return git_config_set_multivar_gently(key, value ? value : "true", "^$", 0);
return git_config_set_multivar_gently(key,
value ? value : "true",
CONFIG_REGEX_NONE, 0);
}

static void write_config(struct string_list *config)
Expand Down
8 changes: 8 additions & 0 deletions t/t5611-clone-config.sh
Expand Up @@ -19,6 +19,14 @@ test_expect_success 'clone -c can set multi-keys' '
test_cmp expect actual
'

test_expect_success 'clone -c can set multi-keys, including some empty' '
rm -rf child &&
git clone -c credential.helper= -c credential.helper=hi . child &&
printf "%s\n" "" hi >expect &&
git --git-dir=child/.git config --get-all credential.helper >actual &&
test_cmp expect actual
'

test_expect_success 'clone -c without a value is boolean true' '
rm -rf child &&
git clone -c core.foo . child &&
Expand Down

0 comments on commit 883247c

Please sign in to comment.