diff options
| -rw-r--r-- | builtin/config.c | 27 | ||||
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 | ||||
| -rwxr-xr-x | t/t9700/test.pl | 3 |
3 files changed, 14 insertions, 22 deletions
diff --git a/builtin/config.c b/builtin/config.c index 08e83fc5ea..77efa697d7 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -107,7 +107,6 @@ static int collect_config(const char *key_, const char *value_, void *cb) char value[256]; const char *vptr = value; int must_free_vptr = 0; - int dup_error = 0; int must_print_delim = 0; if (!use_key_regexp && strcmp(key_, key)) @@ -126,8 +125,6 @@ static int collect_config(const char *key_, const char *value_, void *cb) strbuf_addstr(buf, key_); must_print_delim = 1; } - if (values->nr > 1 && !do_all) - dup_error = 1; if (types == TYPE_INT) sprintf(value, "%d", git_config_int(key_, value_?value_:"")); else if (types == TYPE_BOOL) @@ -149,16 +146,12 @@ static int collect_config(const char *key_, const char *value_, void *cb) vptr = ""; must_print_delim = 0; } - if (dup_error) { - error("More than one value for the key %s: %s", - key_, vptr); - } - else { - if (must_print_delim) - strbuf_addch(buf, key_delim); - strbuf_addstr(buf, vptr); - strbuf_addch(buf, term); - } + + if (must_print_delim) + strbuf_addch(buf, key_delim); + strbuf_addstr(buf, vptr); + strbuf_addch(buf, term); + if (must_free_vptr) /* If vptr must be freed, it's a pointer to a * dynamically allocated buffer, it's safe to cast to @@ -263,14 +256,12 @@ static int get_value(const char *key_, const char *regex_) if (!do_all && !values.nr && system_wide) git_config_from_file(fn, system_wide, data); - if (do_all) - ret = !values.nr; - else - ret = (values.nr == 1) ? 0 : values.nr > 1 ? 2 : 1; + ret = !values.nr; for (i = 0; i < values.nr; i++) { struct strbuf *buf = values.items + i; - fwrite(buf->buf, 1, buf->len, stdout); + if (do_all || i == values.nr - 1) + fwrite(buf->buf, 1, buf->len, stdout); strbuf_release(buf); } free(values.items); diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 51dd5b58bf..97a25f1484 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -254,8 +254,10 @@ test_expect_success 'non-match value' ' test_cmp expect actual ' -test_expect_success 'ambiguous get' ' - test_must_fail git config --get nextsection.nonewline +test_expect_success 'multi-valued get returns final one' ' + echo "wow2 for me" >expect && + git config --get nextsection.nonewline >actual && + test_cmp expect actual ' test_expect_success 'multi-valued get-all returns all' ' diff --git a/t/t9700/test.pl b/t/t9700/test.pl index 3b9b48408a..0d4e366232 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -46,8 +46,7 @@ is($r->get_color("color.test.slot1", "red"), $ansi_green, "get_color"); # Save and restore STDERR; we will probably extract this into a # "dies_ok" method and possibly move the STDERR handling to Git.pm. open our $tmpstderr, ">&STDERR" or die "cannot save STDERR"; close STDERR; -eval { $r->config("test.dupstring") }; -ok($@, "config: duplicate entry in scalar context fails"); +is($r->config("test.dupstring"), "value2", "config: multivar"); eval { $r->config_bool("test.boolother") }; ok($@, "config_bool: non-boolean values fail"); open STDERR, ">&", $tmpstderr or die "cannot restore STDERR"; |