From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jun 2017 21:28:38 +0000 (-0700)
Subject: Merge branch 'rs/pretty-add-again'
X-Git-Tag: v2.14.0-rc0~64
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8af3c643d9c042d806a17fe706470a8c1acee231;p=git-core%2Fgit.git

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

8af3c643d9c042d806a17fe706470a8c1acee231