Re: [PATCH v2 2/3] clean up some of the output from git push --porcelain

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 5, 2010, 21:07 UTC
Message-ID: <7vpr4j1jeq.fsf@alter.siamese.dyndns.org>
In-Reply-To: <ec0db70b8166ee4093a5a2400cd592e4263db20b.1265402797.git.larry@elder-gods.org>

Larry D'Anna <larry@elder-gods.org> writes:

Show 10 quoted lines

> diff --git a/builtin-push.c b/builtin-push.c
> index 0a27072..ff0b1c6 100644
> --- a/builtin-push.c
> +++ b/builtin-push.c
> @@ -123,7 +123,7 @@ static int push_with_options(struct transport *transport, int flags)
>  	if (!err)
>  		return 0;
>  
> -	if (nonfastforward && advice_push_nonfastforward) {
> +	if (!(flags & TRANSPORT_PUSH_PORCELAIN) && nonfastforward && advice_push_nonfastforward) {

I suspect that it would be a much nicer solution if you turned advice_* off in very early parts of the codepath after you read configuration and command line options to see if --porcelain was asked for. That way, we don't have to add code check for PORCELAIN next time we add code for new kinds of advice. People who are adding new advice_* would grep for existing one (e.g. "advice_push_nonfastforward") and will notice this line, but if you had

	if (flags & TRANSPORT_PUSH_PORDCELAIN) {
        	advice_push_nonfastforward = 0;
	}

in early parts of the code, they will notice that as well, and then they know where to add the corresponding change necessary.