summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:20 (GMT)
commit1ad7c0f6896bf0fa0b1b4965d7395b7ba2695fdc (patch)
tree8ac018758924a1b437895974529dccbe8bae664c /builtin/branch.c
parent0884726b43e356d5710db3d516c788fd0b95a57c (diff)
parentbed4452468cc564adc5ab99dfdbee0eb0f7cfb97 (diff)
downloadgit-1ad7c0f6896bf0fa0b1b4965d7395b7ba2695fdc.zip
git-1ad7c0f6896bf0fa0b1b4965d7395b7ba2695fdc.tar.gz
git-1ad7c0f6896bf0fa0b1b4965d7395b7ba2695fdc.tar.bz2
Merge branch 'tk/stripspace'
The internal stripspace() function has been moved to where it logically belongs to, i.e. strbuf API, and the command line parser of "git stripspace" has been updated to use the parse_options API. * tk/stripspace: stripspace: use parse-options for command-line parsing strbuf: make stripspace() part of strbuf
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 01f9530..b99a436 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -592,7 +592,7 @@ static int edit_branch_description(const char *branch_name)
strbuf_release(&buf);
return -1;
}
- stripspace(&buf, 1);
+ strbuf_stripspace(&buf, 1);
strbuf_addf(&name, "branch.%s.description", branch_name);
status = git_config_set(name.buf, buf.len ? buf.buf : NULL);