summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2012-02-13 21:17:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-13 12:49:15 -0800
commitcb8da70547af5cd5c8e03be5a236971951e81277 (patch)
tree17f6330e734a92f05263cac4818ff862adb19665 /builtin/merge-recursive.c
parentSync with 1.7.6.6 (diff)
downloadtgif-cb8da70547af5cd5c8e03be5a236971951e81277.tar.xz
git rev-list: fix invalid typecast
git rev-list passes rev_list_info, not rev_list objects. Without this fix, rev-list enables or disables the --verify-objects option depending on a read from an undefined memory location. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions