All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dominik Maier <dmnk@google.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Patrick Steinhardt <ps@pks.im>, Jeff King <peff@peff.net>,
	 Taylor Blau <me@ttaylorr.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	dmnk+artist@google.com,  Dominik Maier <dmnk@google.com>
Subject: [PATCH] config: skip continued lines when matching section
Date: Thu, 19 Nov 2026 20:23:07 +0100	[thread overview]
Message-ID: <20261119192307.2683812-1-dmnk@google.com> (raw)

repo_config_copy_or_rename_section_in_file() scans the config file line
by line and treats any line whose first non-whitespace character is '['
as the start of a new section, without tracking backslash-continued
values across lines.

When a value in the target section spans multiple lines via a trailing
backslash and a continuation line begins with '[other]', removing or
renaming the section stops early at '[other]' and leaves the remainder
of the continued value behind as an unquoted '[other]' section.

Track backslash value continuations (including quoted subsections and
quote state across continued lines so '#' or ';' inside quotes are not
mistaken for comments) and only treat '[' as a section header at the
start of a logical line.

Signed-off-by: Dominik Maier <dmnk@google.com>
---
 config.c          | 101 ++++++++++++++++++++++++++++++++++++++++++++--
 t/t1300-config.sh |  33 +++++++++++++++
 2 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/config.c b/config.c
index 215dacb6b3..f5fcbd9b84 100644
--- a/config.c
+++ b/config.c
@@ -3427,6 +3427,97 @@ static int section_name_is_ok(const char *name)
 
 #define GIT_CONFIG_MAX_LINE_LEN (512 * 1024)
 
+static const char *skip_section_header(const char *line)
+{
+	const char *p = line;
+
+	if (*p != '[')
+		return line;
+	for (p++; *p && *p != '\r' && *p != '\n'; p++) {
+		if (*p == ']')
+			return p + 1;
+		if (*p == ' ' || *p == '\t') {
+			while (*p == ' ' || *p == '\t')
+				p++;
+			if (*p != '"')
+				return NULL;
+			for (p++; *p && *p != '\r' && *p != '\n'; p++) {
+				if (*p == '\\') {
+					p++;
+					if (!*p || *p == '\r' || *p == '\n')
+						return NULL;
+					continue;
+				}
+				if (*p == '"') {
+					for (p++; *p == ' ' || *p == '\t'; p++)
+						; /* skip trailing space before ']' */
+					return (*p == ']') ? p + 1 : NULL;
+				}
+			}
+			return NULL;
+		}
+	}
+	return NULL;
+}
+
+static void update_line_continuation(const char *p, int *continued,
+				     int *in_quote)
+{
+	int in_value = *continued;
+
+	if (!in_value) {
+		while (isspace(*p))
+			p++;
+		if (*p == '[') {
+			p = skip_section_header(p);
+			if (!p) {
+				*continued = 0;
+				*in_quote = 0;
+				return;
+			}
+		}
+		for (; *p && *p != '\r' && *p != '\n'; p++) {
+			if (*p == '#' || *p == ';') {
+				*continued = 0;
+				*in_quote = 0;
+				return;
+			}
+			if (*p == '=') {
+				p++;
+				in_value = 1;
+				break;
+			}
+		}
+		if (!in_value) {
+			*continued = 0;
+			*in_quote = 0;
+			return;
+		}
+	}
+
+	for (; *p && *p != '\r' && *p != '\n'; p++) {
+		if (!*in_quote && (*p == '#' || *p == ';')) {
+			*continued = 0;
+			return;
+		}
+		if (*p == '"') {
+			*in_quote = !*in_quote;
+			continue;
+		}
+		if (*p == '\\') {
+			if (!p[1] || p[1] == '\n' ||
+			    (p[1] == '\r' && (!p[2] || p[2] == '\n'))) {
+				*continued = 1;
+				return;
+			}
+			p++;
+		}
+	}
+
+	*continued = 0;
+	*in_quote = 0;
+}
+
 /* if new_name == NULL, the section is removed instead */
 static int repo_config_copy_or_rename_section_in_file(
 	struct repository *r,
@@ -3434,7 +3525,7 @@ static int repo_config_copy_or_rename_section_in_file(
 	const char *old_name,
 	const char *new_name, int copy)
 {
-	int ret = 0, remove = 0;
+	int ret = 0, remove = 0, continued = 0, in_quote = 0;
 	char *filename_buf = NULL;
 	struct lock_file lock = LOCK_INIT;
 	int out_fd;
@@ -3496,9 +3587,12 @@ static int repo_config_copy_or_rename_section_in_file(
 			goto out;
 		}
 
+		int was_continued = continued;
+
 		for (i = 0; buf.buf[i] && isspace(buf.buf[i]); i++)
 			; /* do nothing */
-		if (buf.buf[i] == '[') {
+		update_line_continuation(buf.buf, &continued, &in_quote);
+		if (!was_continued && buf.buf[i] == '[') {
 			/* it's a section */
 			size_t offset;
 			is_section = 1;
@@ -3550,8 +3644,9 @@ static int repo_config_copy_or_rename_section_in_file(
 					strbuf_release(&copystr);
 					copystr = store_create_section(new_name, &store);
 				}
+			} else {
+				remove = 0;
 			}
-			remove = 0;
 		}
 		if (remove)
 			continue;
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 876d376cc7..3b323f95f8 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -3049,4 +3049,37 @@ test_expect_success POSIXPERM 'refuse to "overwrite" a read-only file' '
 	)
 '
 
+test_expect_success 'remove-section and rename-section ignore bracketed continuation lines' '
+	test_when_finished "rm -f multiline.cfg rename.cfg subbracket.cfg" &&
+	cat >multiline.cfg <<-\EOF &&
+	[old]
+		key = "first \
+	[smuggled] \
+	# quoted hash \
+		evil = yes"
+	[keep]
+		ok = true
+	EOF
+	cp multiline.cfg rename.cfg &&
+
+	git config --file=multiline.cfg --remove-section old &&
+	test_must_fail git config --file=multiline.cfg --get smuggled.evil &&
+	test "$(git config --file=multiline.cfg --get keep.ok)" = true &&
+
+	git config --file=rename.cfg --rename-section old renamed &&
+	test_must_fail git config --file=rename.cfg --get smuggled.evil &&
+	git config --file=rename.cfg --get renamed.key >actual &&
+	grep "\[smuggled\]" actual &&
+	test "$(git config --file=rename.cfg --get keep.ok)" = true &&
+
+	cat >subbracket.cfg <<-\EOF &&
+	[keep "a] = \""] k = v ; \
+	[old]
+		secret = should_be_removed
+	EOF
+	git config --file=subbracket.cfg --remove-section old &&
+	test_must_fail git config --file=subbracket.cfg --get old.secret &&
+	test "$(git config --file=subbracket.cfg --get "keep.a] = \".k")" = v
+'
+
 test_done
-- 
2.56.1.750.gf70dc682cf-goog


             reply	other threads:[~2026-11-19 19:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 19:23 Dominik Maier [this message]
2026-11-20  0:44 ` [PATCH] config: skip continued lines when matching section Junio C Hamano
2026-11-20 14:33   ` Phillip Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119192307.2683812-1-dmnk@google.com \
    --to=dmnk@google.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=dmnk+artist@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=me@ttaylorr.com \
    --cc=peff@peff.net \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.