diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-14 00:09:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 00:09:41 -0700 |
| commit | 711f6b295cf463aae07eb76e009faed3d3699623 (patch) | |
| tree | 7acf1583cb4daad2293415d996517e1164852c7d /git-merge-one-file.sh | |
| parent | reduce_heads(): thinkofix (diff) | |
| download | tgif-711f6b295cf463aae07eb76e009faed3d3699623.tar.xz | |
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>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions