From: Junio C Hamano <junio@pobox.com>
Date: Fri, 04 Nov 2011 21:22:28 GMT
Subject: Re: [git patches] libata updates, GPG signed (but see admin notes)
Message-ID: <7v39e3bn1n.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vlirvbq47.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> However we would need to audit so that we do not accidentally record the
> tag object names in the "parent" headers in the merge commits, which is
> what I'll be doing next.

Just reporting my findings.

builtin/merge.c was updated to use want_commit() that uses peel_to_type()
to commit to make sure we do not get fed anything funky, and also uses
struct commit_list to pass around list of parents to be recorded, so we
should be OK in this department.