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
Date: Thu, 4 Mar 2021 13:44:03 +0530 [thread overview]
Message-ID: <20210304081403.vmtpxfi75jimxlmx@yadavpratyush.com> (raw)
In-Reply-To: <xmqqmtvje993.fsf@gitster.c.googlers.com>
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
prev parent reply other threads:[~2021-03-04 8:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 10:14 [ANNOUNCE] Git v2.31.0-rc1 Junio C Hamano
2021-03-04 3:41 ` Eric Sunshine
2021-03-04 5:14 ` Eric Sunshine
2021-03-04 6:14 ` Junio C Hamano
2021-03-04 8:14 ` Pratyush Yadav [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210304081403.vmtpxfi75jimxlmx@yadavpratyush.com \
--to=me@yadavpratyush.com \
--cc=git-packagers@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).