Re: Git without morning coffee

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 7, 2011, 17:35 UTC
Message-ID: <7v62l445nw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vehzs47we.fsf@alter.siamese.dyndns.org>

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

Show 8 quoted lines

> Michael J Gruber <git@drmicha.warpmail.net> writes:
>
>> git merge ":/Merge branch 'jk/generation-numbers' into pu"
>> fatal: ':/Merge branch 'jk/generation-numbers' into pu' does not point
>> to a commit
>> # Huh?
>
> Interesting.

This is because 1c7b76b (Build in merge, 2008-07-07) grabs the name of the commit to be merged using peel_to_type(), which was defined in 8177631 (expose a helper function peel_to_type()., 2007-12-24) in terms of get_sha1_1(). It understands $commit~$n, $commit^$n and $ref@{$nth}, but does not understand :/$str, $treeish:$path, and :$stage:$path.