Re: [PATCH 1/3] send-email: Don't use FQDNs without a '.'

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 9, 2010, 05:36 UTC
Message-ID: <7v1vep427o.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1270789906-23735-2-git-send-email-brian@gernhardtsoftware.com>

Brian Gernhardt <brian@gernhardtsoftware.com> writes:

>  		$maildomain = $domain
> -			unless $^O eq 'darwin' && $domain =~ /\.local$/;
> +			unless $^O eq 'darwin' && $domain =~ /\.local$/
> +				or $domain !~ /\./;

It would become *much* easier to read if we stop using the statement modifier, and write it in a more straightforward way:

	unless (($^O eq 'darwin' && $domain =~ /\.local$/)
        	|| $domain !~ /\./) {
                $maildomain = $domain;
	}

as the condition seems to have grown large enough to exceed "by the way don't do this under this narrow condition", which is what statement modifiers are designed to be used. Also mixing && and or that have different precedence taxes readers' brainpower unnecessarily.

I also think that this particular exception logic should probably be in a separate helper function that is called from the two places.

Jari, you are the last person who touched code around this area. What do you think?