summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.2.2.txt
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2010-09-27 12:29:45 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-27 10:39:54 -0700
commit6355e505bacf0a12a5de77bcd0c1198e74ad340b (patch)
treec1e13fda5177484fa34872ff4dc9cba2245f5df3 /Documentation/RelNotes/1.7.2.2.txt
parentgit-stash: fix flag parsing (diff)
downloadtgif-6355e505bacf0a12a5de77bcd0c1198e74ad340b.tar.xz
builtin/revert.c: don't dereference a NULL pointer
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>
Diffstat (limited to 'Documentation/RelNotes/1.7.2.2.txt')
0 files changed, 0 insertions, 0 deletions