linux-kernel - Re: [ANNOUNCE] Git v2.31.0-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <xmqqmtvje993.fsf@gitster.c.googlers.com>
Date:   Wed, 03 Mar 2021 22:14:00 -0800
From:   Junio C Hamano <gitster@...ox.com>
To:     Eric Sunshine <sunshine@...shineco.com>,
        Pratyush Yadav <me@...avpratyush.com>
Cc:     Git List <git@...r.kernel.org>,
        Linux Kernel <linux-kernel@...r.kernel.org>,
        git-packagers@...glegroups.com
Subject: Re: [ANNOUNCE] Git v2.31.0-rc1

Eric Sunshine <sunshine@...shineco.com> writes:

> On Wed, Mar 3, 2021 at 7:23 PM Junio C Hamano <gitster@...ox.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?