From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Progress on merging Eglot? Date: Mon, 19 Sep 2022 17:59:00 +0100 Message-ID: References: <875yhjz5jh.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="00000000000045c75705e90a9d79" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18326"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Payas Relekar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Sep 19 19:02:50 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oaKAU-0004aJ-Gc for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 19:02:50 +0200 Original-Received: from localhost ([::1]:57010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaKAT-0002GD-D9 for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 13:02:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaK5s-0008Bh-1l for emacs-devel@gnu.org; Mon, 19 Sep 2022 12:58:04 -0400 Original-Received: from mail-vs1-xe33.google.com ([2607:f8b0:4864:20::e33]:40751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaK5q-0004H1-6R for emacs-devel@gnu.org; Mon, 19 Sep 2022 12:58:03 -0400 Original-Received: by mail-vs1-xe33.google.com with SMTP id q26so205460vsr.7 for ; Mon, 19 Sep 2022 09:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=qIverzdP6l5qTGmXoOSNiw/uOEym9siy1g+w/9A6TIc=; b=IXi6ey5BW5wGeB2D03FdSP0+plVTyrnP59XKIGJwZ+WGXLbCAzCnwsTgAG+ksLTe0A RjxMSFZltqjBQkZZgFbrqG/4Ug48daQX9J+11tMwR1ajudoWWN8eOIR2SB6Wfju4f3n3 44b+hK4aJ2IN1csw65uiraoYc76OptiygpVDDE3Lrc2Pr/r3zZ2TXkS2oh8iGcKMhyt8 U1lN0b3SGOPfxd2AYqYvOF2z/DJjRqh+LGZtFGxcjlkf2zQ0szzbTkf/LgDBOVRmFsgj fUPJtc1BajypAZzcHPUWQJyUcJTmdEDVZ1iXMi+fMhaoaledGJLVv5yjgW8dX24lFxg4 jfUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=qIverzdP6l5qTGmXoOSNiw/uOEym9siy1g+w/9A6TIc=; b=JkWUTOqa1QIpVu6UsOLFCFei8vUeYhATKQQvZdJgiIHrUFdXQxTjLJJt0Pufaq+Ml1 4d/CWxa3OH8UJPkMjDuBGSATd0NlBYsX1FliRJvJnTpZaxW1y5ieOLCHNqjTCHZ3CKEj ENUcgf8Thb2D8BSb+tJ1ozp7hmxlaJB/fzWJDnR1AQ61WbBYkcAncNHQ+390moHzW7QR DPqN/+f3XYMUrFmFdWiIvUTehn72BUzPfjitW42O/F6qkgxbT6K8KV/s3RBgzlxH2DjP NkSPgaYot1Tns85ZQR0az32pr50PJZTyapL3KgmvG5muiirVkYWaAi21BwDT6osQxBI9 fLSA== X-Gm-Message-State: ACrzQf1/Eqev78HepckGGYQyoqaqIvmBxKLwrBlSRAF3dN7gQvyC59oN 1Xy30D7qFf2Z+NwSO0KGpv9FpQCzjhBWiwFHeiyR27Yc X-Google-Smtp-Source: AMsMyM4VZtApySEEkjD+2hzo4Wb4rzcynGgirLRNFvh6AfmPj1NWcygHgncC02PXyK0d2T9hQiPH1/hswWymJFIaHQM= X-Received: by 2002:a67:d585:0:b0:398:a3c8:ee34 with SMTP id m5-20020a67d585000000b00398a3c8ee34mr6404174vsj.48.1663606681092; Mon, 19 Sep 2022 09:58:01 -0700 (PDT) In-Reply-To: <875yhjz5jh.fsf@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::e33; envelope-from=joaotavora@gmail.com; helo=mail-vs1-xe33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:295725 Archived-At: --00000000000045c75705e90a9d79 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Sep 19, 2022 at 5:54 PM Payas Relekar wrote: > Jo=C3=A3o T=C3=A1vora writes: > > > No, that wasn't it. It probably worked for you because your script > clones > > a fresh > > emacs.git repo without installing the pre-commit hooks. When they are = in > > place, > > the merge is prevented. I haven't investigated why: there is some logi= c > in > > ~/.git/hooks/pre-commit that supposedly nullifies the hook for merges. > > Possible, every time I made changes to script, I had emacs repo hard > reset to upstream master. Maybe try that first? > That doesn't affect the hooks already commited to ~/.git/hooks The reason we're getting bitten by this is because I'm using a "git worktree" working tree which shared the ~/.git/ directory with the principal working tree. I'll add a comment to the gist to warn about this pitfall. Meanwhile, using a fresh non-git-worktree clone also fixes it. > Anyway, when the hook is laid to rest, the result is something like what = I > > just uploaded to the scratch/eglot2emacs branch: > > > > This branch will probably be deleted and re-created frequently as we > tweak > > the script. > > I hope that isn't a problem. Stefan? > > Excellente! And away we go.... > Yes, thanks for kicking things off! Jo=C3=A3o --00000000000045c75705e90a9d79 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, Sep 19, 2022 at 5:54 PM Payas Relekar <relekarpayas@gmail.com> wrote:
Jo=C3=A3o T=C3=A1vora <joaotavora@gmail.com= > writes:

> No, that wasn't it.=C2=A0 It probably worked for you because your = script clones
> a fresh
> emacs.git repo without installing the pre-commit hooks.=C2=A0 When the= y are in
> place,
> the merge is prevented.=C2=A0 I haven't investigated why: there is= some logic in
> ~/.git/hooks/pre-commit that supposedly nullifies the hook for merges.=

Possible, every time I made changes to script, I had emacs repo hard
reset to upstream master. Maybe try that first?

That doesn't affect the hooks already commited to ~/.git/hooks=
The reason we're getting bitten by this is because I'm u= sing a "git worktree"
working tree which shared th= e ~/.git/ directory with the principal working tree.

I'll add a comment to the gist to warn about this pitfall.=C2=A0 Mea= nwhile, using a fresh
non-git-worktree clone also fixes it.<= /div>

> Anyway, when the hook is laid to rest, the result is something like wh= at I
> just uploaded to the scratch/eglot2emacs branch:
>
> This branch will probably be deleted and re-created frequently as we t= weak
> the script.
> I hope that isn't a problem.=C2=A0 Stefan?

Excellente! And away we go....

Yes, tha= nks for kicking things off!

Jo=C3=A3o
--00000000000045c75705e90a9d79--