]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7600-merge.sh
reduce_heads(): protect from duplicate input
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jul 2008 07:09:41 +0000 (00:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jul 2008 07:09:41 +0000 (00:09 -0700)
commit711f6b295cf463aae07eb76e009faed3d3699623
tree7acf1583cb4daad2293415d996517e1164852c7d
parent3d1dd4728b83e4c08d9fa7aaf2aa946e1012e061
reduce_heads(): protect from duplicate input

Because we do not try computing merge base with itself for obvious
reasons, the code was not prepared for an arguably insane case of
the caller feeding the same commit twice to it.

Noticed and test written by Sverre Hvammen Johansen

Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit.c
t/t7600-merge.sh