Re: [RFC] git rev-contains [Was: merge -s ffonly]

From: Deskin Miller <deskinm@umich.edu>
Date: Oct 8, 2008, 14:30 UTC
Message-ID: <20081008143050.GG3052@riemann.deskinm.fdns.net>
In-Reply-To: <20081007185815.GA10744@strlen.de>

On Tue, Oct 07, 2008 at 08:58:15PM +0200, =?ISO-8859-1?Q?Uwe_Kleine-K=F6nig_ wrote:

Show 8 quoted lines

> > +	if test -n "$(git rev-list $1..HEAD)"
> I already wrote similar tests and I wonder if this couldn't be done in a
> new builtin command more effectively.  Something like
> 
> 	git rev-contains HEAD "$1"
> 
> .  I expect it to be faster and maybe it prevents a command line
> overflow?! [...]

 
I'm not sure this warrants a builtin; seems like test is perfectly capable of
doing what you want:

if test '(' -n "$(git rev-list --max-count=1 $1..HEAD)" ')' -a \
	'(' -z "$(git rev-list --max-count=1 HEAD..$1)" ')'

The second check is needed to ensure that the commits actually have an ancestor-descendant relationship. And --max-count means your command line won't overflow.

Or what about this:

if test "$(git merge-base $1 HEAD)" = "$(git rev-parse $1)"

My $0.02, Deskin Miller