From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Feb 2021 00:31:27 +0000 (-0800)
Subject: Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint
X-Git-Tag: v2.30.1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d436678a70c118bc2683b8d81131459e602a1d7;p=thirdparty%2Fgit.git

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

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

2d436678a70c118bc2683b8d81131459e602a1d7