diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:26 -0800 |
| commit | e23469f91a3417e7680cda2402c3c6c4a653cf54 (patch) | |
| tree | 7690f3099e612e8e9819d72422f22bcf5ebe2467 /builtin/am.c | |
| parent | f89baca1b99ff2882690d6b58dc2071195c6ae84 (diff) | |
| parent | bed4452468cc564adc5ab99dfdbee0eb0f7cfb97 (diff) | |
| download | git-e23469f91a3417e7680cda2402c3c6c4a653cf54.tar.gz git-e23469f91a3417e7680cda2402c3c6c4a653cf54.tar.xz | |
Merge branch 'tk/stripspace' into maint
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/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 3bd4fd701..7b8e11eea 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1343,7 +1343,7 @@ static int parse_mail(struct am_state *state, const char *mail) strbuf_addstr(&msg, "\n\n"); if (strbuf_read_file(&msg, am_path(state, "msg"), 0) < 0) die_errno(_("could not read '%s'"), am_path(state, "msg")); - stripspace(&msg, 0); + strbuf_stripspace(&msg, 0); if (state->signoff) am_signoff(&msg); |