Merge branch 'rs/pretty-add-again'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:38 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:38 +0000 (14:28 -0700)
commit8af3c643d9c042d806a17fe706470a8c1acee231
tree87438082732a3f76f36c1724fa5edaabb773b836
parentef9402366ccf4a04348024d51c0d3897f8b868c9
parentfe9e2aefd4adac63821d0c007effcc8087e32ad6
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
pretty.c
strbuf.c
strbuf.h