git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 635ff67 c9e3a4e)
Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint
authorJunio C Hamano <redacted>
Sat, 6 Feb 2021 00:31:27 +0000 (16:31 -0800)
committerJunio C Hamano <redacted>
Sat, 6 Feb 2021 00:31:28 +0000 (16:31 -0800)
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

1  2 
patch-ids.c patch | diff1 | diff2 | blob | history
revision.c patch | diff1 | diff2 | blob | history

diff --cc patch-ids.c
Simple merge
diff --cc revision.c
Simple merge
git clone https://git.99rst.org/PROJECT