Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; q=dns; s=sasl; b=Yi3mpdOOKBsX3UrdkHf5dSks3JINf6Ky
        v6OVjCqUnWhRnoKluyamrYByoMB4Pa0ThQOwtki6R7FgqSEHCwqqEl37WI/ms1/U
        7dGH9dP9nm2JAsQXcik9w92O4WqiLuT8uqEwrhPnm7j/MpY62Abe+Pk2hzwChA3C
        pKh74luPdVM=
From:   Junio C Hamano <gitster@pobox.com>
To:     Eric Sunshine <sunshine@sunshineco.com>,
        Pratyush Yadav <me@yadavpratyush.com>
Cc:     Git List <git@vger.kernel.org>,
        Linux Kernel <linux-kernel@vger.kernel.org>,
        git-packagers@googlegroups.com
Subject: Re: [ANNOUNCE] Git v2.31.0-rc1
References: <xmqqr1kwk0h9.fsf@gitster.c.googlers.com>
        <CAPig+cSC8uNfoAjDKdBNheod9_0-pCD-K_2kwt+J8USnoyQ7Aw@mail.gmail.com>
Date:   Wed, 03 Mar 2021 22:14:00 -0800
In-Reply-To: <CAPig+cSC8uNfoAjDKdBNheod9_0-pCD-K_2kwt+J8USnoyQ7Aw@mail.gmail.com>
        (Eric Sunshine's message of "Thu, 4 Mar 2021 00:14:06 -0500")
Message-ID: <xmqqmtvje993.fsf@gitster.c.googlers.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Wed, Mar 3, 2021 at 7:23 PM Junio C Hamano <gitster@pobox.com> wrote:
>> Pratyush Yadav (1):
>>       git-gui: remove lines starting with the comment character
>
> Is there some way that this can be removed from v2.31.0 before final
> release? It badly breaks git-gui on macOS[1,2] to the point of making
> it unusable (Tcl throws errors at launch time and when trying to
> commit, and committing is 100% broken).

Thanks.

I could revert the merge with the problematic changes to git-gui,
i.e. 0917373 (Merge https://github.com/prati0100/git-gui,
2021-03-01), but if possible, I'd rather merge a revert made on the
git-gui side.  If b1056f60 (Merge branch 'py/commit-comments',
2021-02-22) is the tip of git-gui repository, and b9a43869 (git-gui:
remove lines starting with the comment character, 2021-02-03) is
what breaks, perhaps 

    $ git checkout b1056f60^2 &&
      git revert b9a43869 &&
      git checkout b1056f60 &&
      git merge @{-1}

would be what we want to have at the tip of git-gui until the
breakage gets sorted out.

Pratyush?