undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix "git -c" parsing of values with equals signs

Browse Source 
If you do something like:

  git -c core.foo="value with = in it" ...

we would split your option on "=" into three fields and
throw away the third one. With this patch we correctly take
everything after the first "=" as the value (keys cannot
have an equals sign in them, so the parsing is unambiguous).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-06-09 11:51:36 -04:00 committed by Junio C Hamano
parent 28fc3a6857
commit 5bf6529aaa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -45,7 +45,7 @@ static int git_config_parse_parameter(const char *text,
struct strbuf tmp = STRBUF_INIT; struct strbuf tmp = STRBUF_INIT;
struct strbuf **pair; struct strbuf **pair;
strbuf_addstr(&tmp, text); strbuf_addstr(&tmp, text);
pair = strbuf_split(&tmp, '='); pair = strbuf_split_max(&tmp, '=', 2);
if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=')
strbuf_setlen(pair[0], pair[0]->len - 1); strbuf_setlen(pair[0], pair[0]->len - 1);
strbuf_trim(pair[0]); strbuf_trim(pair[0]);

6
t/t1300-repo-config.sh
View File

@ -904,4 +904,10 @@ test_expect_success 'git -c works with aliases of builtins' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'git -c does not split values on equals' '
echo "value with = in it" >expect &&
git -c core.foo="value with = in it" config core.foo >actual &&
test_cmp expect actual
'
test_done test_done