diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:57 -0700 |
commit | 49771171e5b2802413a8645e8d1a25fafa5eca9f (patch) | |
tree | 2e245edd0b950c2d5d5fdfd249f2e5b3aeb09ada /strbuf.c | |
parent | Merge branch 'ah/doc-gitattributes-empty-index' into maint (diff) | |
parent | pretty: recalculate duplicate short hashes (diff) | |
download | tgif-49771171e5b2802413a8645e8d1a25fafa5eca9f.tar.xz |
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.c')
-rw-r--r-- | strbuf.c | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -204,13 +204,6 @@ void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) strbuf_setlen(sb, sb->len + sb2->len); } -void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len) -{ - strbuf_grow(sb, len); - memcpy(sb->buf + sb->len, sb->buf + pos, len); - strbuf_setlen(sb, sb->len + len); -} - void strbuf_addchars(struct strbuf *sb, int c, size_t n) { strbuf_grow(sb, n); |