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)
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

1  2 
pretty.c
strbuf.c
strbuf.h

diff --cc pretty.c
Simple merge
diff --cc strbuf.c
Simple merge
diff --cc strbuf.h
Simple merge