From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <git-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: AS53758 23.128.96.0/24
X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,
	SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham
	autolearn_force=no version=3.4.2
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by dcvr.yhbt.net (Postfix) with ESMTP id ABD011F934
	for <e@yhbt.net>; Mon, 26 Apr 2021 19:57:54 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S241597AbhDZT6d (ORCPT <rfc822;e@yhbt.net>);
        Mon, 26 Apr 2021 15:58:33 -0400
Received: from mav.lukeshu.com ([104.207.138.63]:39690 "EHLO mav.lukeshu.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S236419AbhDZT6d (ORCPT <rfc822;git@vger.kernel.org>);
        Mon, 26 Apr 2021 15:58:33 -0400
Received: from lukeshu-dw-thinkpad (unknown [IPv6:2601:281:8200:26:4e34:88ff:fe48:5521])
        by mav.lukeshu.com (Postfix) with ESMTPSA id 670A380590;
        Mon, 26 Apr 2021 15:57:49 -0400 (EDT)
Date:   Mon, 26 Apr 2021 13:57:48 -0600
Message-ID: <87o8e0akeb.wl-lukeshu@lukeshu.com>
From:   Luke Shumaker <lukeshu@lukeshu.com>
To:     git@vger.kernel.org
Cc:     Avery Pennarun <apenwarr@gmail.com>,
        Charles Bailey <cbailey32@bloomberg.net>,
        Danny Lin <danny0838@gmail.com>,
        "David A . Greene" <greened@obbligato.org>,
        David Aguilar <davvid@gmail.com>,
        Jakub Suder <jakub.suder@gmail.com>,
        James Denholm <nod.helm@gmail.com>, Jeff King <peff@peff.net>,
        Jonathan Nieder <jrnieder@gmail.com>,
        Junio C Hamano <gitster@pobox.com>,
        =?UTF-8?B?Tmd1?= =?UTF-8?B?eeG7hW4g?= =?ISO-8859-1?Q?Th=E1i_?=
         =?UTF-8?B?Tmfhu41j?= Duy <pclouds@gmail.com>,
        Roger L Strain <roger.strain@swri.org>,
        Techlive Zheng <techlivezheng@gmail.com>,
        Eric Sunshine <sunshine@sunshineco.com>,
        =?ISO-8859-1?Q?=C6var_Arnfj=F6r=F0?= Bjarmason <avarab@gmail.com>,
        Luke Shumaker <lukeshu@datawire.io>
Subject: Re: [PATCH v2 04/30] subtree: t7900: use consistent formatting
In-Reply-To: <20210426174525.3937858-5-lukeshu@lukeshu.com>
References: <20210423194230.1388945-1-lukeshu@lukeshu.com>
        <20210426174525.3937858-1-lukeshu@lukeshu.com>
        <20210426174525.3937858-5-lukeshu@lukeshu.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue)
 FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0
 Emacs/27.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue")
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

On Mon, 26 Apr 2021 11:44:59 -0600,
Luke Shumaker wrote:
> @@ -50,15 +46,17 @@ undo()
>  # The original set of commits changed only one file each.
>  # A multi-file change would imply that we pruned commits
>  # too aggressively.
> -join_commits()
> -{
> +join_commits () {
>  	commit=
>  	all=
>  	while read x y; do
> -		if [ -z "$x" ]; then
> +		if test -z "$x"
> +		then
>  			continue
> -		elif [ "$x" = "commit:" ]; then
> -			if [ -n "$commit" ]; then
> +		elif test "$x" = "commit:"
> +		then
> +			if test -n "$commit"
> +			then
>  				echo "$commit $all"
>  				all=
>  			fi

Whoops, I should have changed those 1-line `while ...; do`'s, in
addition to the 1-line `if ...; then`'s.

-- 
Happy hacking,
~ Luke Shumaker