@matheusbsbs / matheus-bagliano / commits / 5a2df368c2

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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael J Gruber committed May 17, 2011 at 17:38 UTC 5a2df368c26e4a993db9d09f221af1063d0fe9a8

1 file changed +6 -1

builtin/config.c

+6 -1

@@ -436,9 +436,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)

436 NULL, NULL);

437 }

438 else if (actions == ACTION_SET) {

439 + int ret;

440 check_argc(argc, 2, 2);

441 value = normalize_value(argv[0], argv[1]);

441 - return git_config_set(argv[0], value);

442 + ret = git_config_set(argv[0], value);

443 + if (ret == CONFIG_NOTHING_SET)

444 + error("cannot overwrite multiple values with a single value\n"

445 + " Use a regexp, --add or --set-all to change %s.", argv[0]);

446 + return ret;

447 }

448 else if (actions == ACTION_SET_ALL) {

449 check_argc(argc, 2, 3);