git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
committer	Junio C Hamano <redacted>
	Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
commit	b69bed22c59fa08848bd7ffa5fbfacc0b62fcd48
tree	047ebb72feb3534f7929ae8a52cb9e43a0f23d81	tree \| snapshot
parent	27d7c8599b159862762e2bd121c22d516fb04e90	commit \| diff
parent	c9e3a4e76d57b03170118aa67054af0b81e7f507	commit \| diff

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

patch-ids.c	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
t/t6007-rev-list-cherry-pick-file.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

patch-ids.c	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
t/t6007-rev-list-cherry-pick-file.sh	diff1 \|	diff2 \|	blob \| history