mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-27 08:41:11 +02:00
Code

git_config_set: fix off-by-two

Browse Source 
Currently, we are slightly overzealous When removing an entry from a
config file of this form:

	[abc]a
	[xyz]
		key = value

When calling `git config --unset abc.a` on this file, it leaves this
(invalid) config behind:

	[
	[xyz]
		key = value

The reason is that we try to search for the beginning of the line (or
for the end of the preceding section header on the same line) that
defines abc.a, but as an optimization, we subtract 2 from the offset
pointing just after the definition before we call
find_beginning_of_line(). That function, however, *also* performs that
optimization and promptly fails to find the section header correctly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-04-03 18:28:00 +02:00 committed by Junio C Hamano
parent d32eb83c1d
commit 83b7fd8771
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -2624,7 +2624,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
} else
copy_end = find_beginning_of_line(
contents, contents_sz,
store.offset[i]-2, &new_line);
store.offset[i], &new_line);
if (copy_end > 0 && contents[copy_end-1] != '\n')
new_line = 1;