Merge branch 'tk/stripspace' into maint

diff --git a/builtin/am.c b/builtin/am.c
index 3bd4fd701bdccab91f1343b371cf19e822c14db5..7b8e11eeaa366c02aa0bf88017ed0af7b12162fb 100644 (file)
--- 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);