From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:58:57 +0000 (-0700)
Subject: Merge branch 'rs/pretty-add-again' into maint
X-Git-Tag: v2.13.3~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/49771171e5b2802413a8645e8d1a25fafa5eca9f

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

49771171e5b2802413a8645e8d1a25fafa5eca9f