[PATCH/RFC v3 2/3] config: abstract out create section from key logic
- From
Sahil Dua <sahildua2305@gmail.com>
- Date
- Jun 1, 2017, 18:35 UTC
- Message-ID
- <0102015c64f0dd7b-736a46c7-cb00-43ea-b55d-826d451b6ee1-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <0102015c64f0dceb-02338e52-74d5-4d6c-9a9d-f41e98ff88bc-000000@eu-west-1.amazonses.com>
Abstracts out the logic for creating string buffer from given key for example - 'branch.b' and returns '[branch "b"]'.
We want to keep the original config section intact in case of copy operation. For this we need to fetch the section with updated new branch name so that we can write that to the config file.
For example - git branch -c foo bar The mentioned/edited function renames and overwrites this part in the config - [branch "foo"] to [branch "bar"]. However, in case of copy, we want to keep the original [branch "foo"] intact and get [branch "bar"] from "branch.bar" key. 'store_create_section' function will return [branch "bar"] when "branch.bar" is passed.
Signed-off-by: Sahil Dua <sahildua2305@gmail.com> --- config.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c index 146cb3452adab..721aef1938081 100644 --- a/config.c +++ b/config.c @@ -2169,10 +2169,10 @@ static int write_error(const char *filename) return 4; } -static int store_write_section(int fd, const char *key) +struct strbuf store_create_section(const char *key) { const char *dot; - int i, success; + int i; struct strbuf sb = STRBUF_INIT; dot = memchr(key, '.', store.baselen); @@ -2188,6 +2188,16 @@ static int store_write_section(int fd, const char *key) strbuf_addf(&sb, "[%.*s]\n", store.baselen, key); } + return sb; +} + +static int store_write_section(int fd, const char *key) +{ + int success; + + /* Create a section with the given key */ + struct strbuf sb = store_create_section(key); + success = write_in_full(fd, sb.buf, sb.len) == sb.len; strbuf_release(&sb); -- https://github.com/git/git/pull/363