]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3200-branch.sh
branch: don't assume the merge filter ref exists
authorCarlos Martín Nieto <cmn@elego.de>
Mon, 27 Feb 2012 15:11:53 +0000 (16:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 19:35:33 +0000 (11:35 -0800)
commit6c41e97557d94df7085e3c0cff247305c9401968
tree409b6b72b2a54f7d944bf573a29fef08356f2038
parentc524ceb12f65e2ad4fc68c9d5b39f6e4b6b5c17b
branch: don't assume the merge filter ref exists

print_ref_list looks up the merge_filter_ref and assumes that a valid
pointer is returned. When the object doesn't exist, it tries to
dereference a NULL pointer. This can be the case when git branch
--merged is given an argument that isn't a valid commit name.

Check whether the lookup returns a NULL pointer and die with an error
if it does. Add a test, while we're at it.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
t/t3200-branch.sh