Merge branch 'dt/name-hash-dir-entry-fix' into maint

diff --git a/builtin/branch.c b/builtin/branch.c
index ff05869949b7c5c4cd0034e7a0ba54e2adeae6b4..baaa44c1ae23b6dbf761e358eab6ffb51a02b871 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -786,7 +786,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);