summaryrefslogtreecommitdiff
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorLibravatar Carlos Martín Nieto <cmn@elego.de>2012-02-27 16:11:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-27 11:35:33 -0800
commit6c41e97557d94df7085e3c0cff247305c9401968 (patch)
tree409b6b72b2a54f7d944bf573a29fef08356f2038 /Documentation/git-show-branch.txt
parentGit 1.7.8.5 (diff)
downloadtgif-6c41e97557d94df7085e3c0cff247305c9401968.tar.xz
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>
Diffstat (limited to 'Documentation/git-show-branch.txt')
0 files changed, 0 insertions, 0 deletions