diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-26 22:55:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 22:55:20 (GMT) |
| commit | 1ad7c0f6896bf0fa0b1b4965d7395b7ba2695fdc (patch) | |
| tree | 8ac018758924a1b437895974529dccbe8bae664c /builtin/merge.c | |
| parent | 0884726b43e356d5710db3d516c788fd0b95a57c (diff) | |
| parent | bed4452468cc564adc5ab99dfdbee0eb0f7cfb97 (diff) | |
| download | git-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/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a0a9328..977ffff 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -806,7 +806,7 @@ static void prepare_to_commit(struct commit_list *remoteheads) abort_commit(remoteheads, NULL); } read_merge_msg(&msg); - stripspace(&msg, 0 < option_edit); + strbuf_stripspace(&msg, 0 < option_edit); if (!msg.len) abort_commit(remoteheads, _("Empty commit message.")); strbuf_release(&merge_msg); |