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;
Date:   Thu, 4 Mar 2021 13:44:03 +0530
From:   Pratyush Yadav <me@yadavpratyush.com>
To:     Junio C Hamano <gitster@pobox.com>
Cc:     Eric Sunshine <sunshine@sunshineco.com>,
        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
Message-ID: <20210304081403.vmtpxfi75jimxlmx@yadavpratyush.com>
References: <xmqqr1kwk0h9.fsf@gitster.c.googlers.com>
 <CAPig+cSC8uNfoAjDKdBNheod9_0-pCD-K_2kwt+J8USnoyQ7Aw@mail.gmail.com>
 <xmqqmtvje993.fsf@gitster.c.googlers.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <xmqqmtvje993.fsf@gitster.c.googlers.com>
Precedence: bulk

On 03/03/21 10:14PM, Junio C Hamano wrote:
> 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?

I will send a follow-up PR with the patch reverted. I'll then apply 
Eric's patch to fix breakage on MacOS and let it simmer till the next 
release. Let's not risk any breaking changes close to release.

-- 
Regards,
Pratyush Yadav