diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 23:58:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 23:58:57 +0300 |
commit | 49771171e5b2802413a8645e8d1a25fafa5eca9f (patch) | |
tree | 2e245edd0b950c2d5d5fdfd249f2e5b3aeb09ada /strbuf.h | |
parent | 86d51bbe1aacc7574241a33c3667581640a23841 (diff) | |
parent | fe9e2aefd4adac63821d0c007effcc8087e32ad6 (diff) |
Merge branch 'rs/pretty-add-again' into maint
The pretty-format specifiers like '%h', '%t', etc. had an
optimization that no longer works correctly. In preparation/hope
of getting it correctly implemented, first discard the optimization
that is broken.
* rs/pretty-add-again:
pretty: recalculate duplicate short hashes
Diffstat (limited to 'strbuf.h')
-rw-r--r-- | strbuf.h | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -264,12 +264,6 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) extern void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2); /** - * Copy part of the buffer from a given position till a given length to the - * end of the buffer. - */ -extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len); - -/** * This function can be used to expand a format string containing * placeholders. To that end, it parses the string and calls the specified * function for every percent sign found. |