summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:38 (GMT)
commit8af3c643d9c042d806a17fe706470a8c1acee231 (patch)
tree87438082732a3f76f36c1724fa5edaabb773b836 /strbuf.c
parentef9402366ccf4a04348024d51c0d3897f8b868c9 (diff)
parentfe9e2aefd4adac63821d0c007effcc8087e32ad6 (diff)
downloadgit-8af3c643d9c042d806a17fe706470a8c1acee231.zip
git-8af3c643d9c042d806a17fe706470a8c1acee231.tar.gz
git-8af3c643d9c042d806a17fe706470a8c1acee231.tar.bz2
Merge branch 'rs/pretty-add-again'
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.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/strbuf.c b/strbuf.c
index be3b9e3..c4e91a6 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -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);