From: Michael J Gruber Date: Tue, 17 May 2011 15:38:53 +0000 (+0200) Subject: config: Give error message when not changing a multivar X-Git-Tag: v1.7.6-rc0~42^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a2df368c26e4a993db9d09f221af1063d0fe9a8;p=git.git config: Give error message when not changing a multivar When trying to set a multivar with "git config var value", "git config" issues warning: remote.repoor.push has multiple values leaving the user under the impression that the operation succeeded, unless one checks the return value. Instead, make it warning: remote.repoor.push has multiple values error: cannot overwrite multiple values with a single value Use a regexp, --add or --set-all to change remote.repoor.push. to be clear and helpful. Note: The "warning" is raised through other code paths also so that it needs to remain a warning for these (which do not raise the error). Only the caller can determine how to go on from that. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/builtin/config.c b/builtin/config.c index 3e3c52849..211e118d5 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -436,9 +436,14 @@ int cmd_config(int argc, const char **argv, const char *prefix) NULL, NULL); } else if (actions == ACTION_SET) { + int ret; check_argc(argc, 2, 2); value = normalize_value(argv[0], argv[1]); - return git_config_set(argv[0], value); + ret = git_config_set(argv[0], value); + if (ret == CONFIG_NOTHING_SET) + error("cannot overwrite multiple values with a single value\n" + " Use a regexp, --add or --set-all to change %s.", argv[0]); + return ret; } else if (actions == ACTION_SET_ALL) { check_argc(argc, 2, 3);