summaryrefslogtreecommitdiff
path: root/t/t3506-cherry-pick-ff.sh
AgeCommit message (Collapse)AuthorFilesLines
2010-09-27builtin/revert.c: don't dereference a NULL pointerLibravatar Brandon Casey1-0/+10
cherry-pick will segfault when transplanting a root commit if the --ff option is used. This happens because the "parent" pointer is set to NULL when the commit being cherry-picked has no parents. Later, when "parent" is dereferenced, the cherry-pick segfaults. Fix this by checking whether "parent" is NULL before dereferencing it and add a test for this case of cherry-picking a root commit with --ff. Reported-by: Zbyszek Szmek <zbyszek@in.waw.pl> Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-06cherry-pick: add tests for new --ff optionLibravatar Christian Couder1-0/+98
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>