From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 7 Sep 2021 21:05:03 +0000 (+0000)
Subject: remote: warn about unhandled branch.<name>.rebase values
X-Git-Tag: v2.34.0-rc0~53^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab7c7c219b487ad8cde94c8c1155977cb2efd52b;p=thirdparty%2Fgit.git

remote: warn about unhandled branch.<name>.rebase values

We ignore them silently, but it actually makes sense to warn the users
that their config setting has no effect.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/remote.c b/builtin/remote.c
index 7f88e6ce9d..5705e088e5 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -318,6 +318,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 		 * truth value with >= REBASE_TRUE.
 		 */
 		info->rebase = rebase_parse_value(value);
+		if (info->rebase == REBASE_INVALID)
+			warning(_("unhandled branch.%s.rebase=%s; assuming "
+				  "'true'"), name, value);
 		break;
 	case PUSH_REMOTE:
 		if (info->push_remote_name)