Merge branch 'pt/http-socks-proxy' into maint

diff --git a/builtin/tag.c b/builtin/tag.c
index cba0e2266623d57fe96fcec1910c562bf424d143..f048cae0e0593866105574e685b97eb71023fbd2 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -498,7 +498,7 @@ static void create_tag(const unsigned char *object, const char *tag,
        }
 
        if (opt->cleanup_mode != CLEANUP_NONE)
-               stripspace(buf, opt->cleanup_mode == CLEANUP_ALL);
+               strbuf_stripspace(buf, opt->cleanup_mode == CLEANUP_ALL);
 
        if (!opt->message_given && !buf->len)
                die(_("no tag message?"));