Re: Git blame only current branch

From: Vijay Lakshminarayanan <laksvij@gmail.com>
Date: Dec 13, 2011, 02:07 UTC
Message-ID: <8739cpteat.fsf@gmail.com>
In-Reply-To: <20111212165542.GA4802@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

[snip]

Show 13 quoted lines

> diff --git a/builtin/blame.c b/builtin/blame.c
> index 80febbe..c19a8cd 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -1191,6 +1191,8 @@ static int num_scapegoats(struct rev_info *revs, struct commit *commit)
>  {
>  	int cnt;
>  	struct commit_list *l = first_scapegoat(revs, commit);
> +	if (revs->first_parent_only)
> +		return l ? 1 : 0;
>  	for (cnt = 0; l; l = l->next)
>  		cnt++;
>  	return cnt;

I just spent 30s staring at this wondering why you needed to do

    return 1 ? 1 : 0;

which always returns 1 anyway before I realized it was a lowercase L.

The code reads fine when there's no numeral 1 around but now it doesn't read well. I think refactoring

    struct commit_list *l

to

    struct commit_list *lst

is justified.  Thoughts?

> -Peff

-- 
Cheers
~vijay

Gnus should be more complicated.