From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jan 2021 22:19:19 +0000 (-0800)
Subject: Merge branch 'jk/log-cherry-pick-duplicate-patches'
X-Git-Tag: v2.31.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b69bed22c59fa08848bd7ffa5fbfacc0b62fcd48;p=thirdparty%2Fgit.git

Merge branch 'jk/log-cherry-pick-duplicate-patches'

When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side.  Now it
does.

* jk/log-cherry-pick-duplicate-patches:
  patch-ids: handle duplicate hashmap entries
---

b69bed22c59fa08848bd7ffa5fbfacc0b62fcd48