From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: emacs-29 e2ac0d416b9 1/5: ; Merge from origin/emacs-28 Date: Sun, 19 Feb 2023 09:31:08 -0800 Message-ID: References: <83h6vhwpop.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38615"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Feb 19 18:31:56 2023 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 1pTnXY-0009uY-8u for ged-emacs-devel@m.gmane-mx.org; Sun, 19 Feb 2023 18:31:56 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTnWs-0004YL-Lr; Sun, 19 Feb 2023 12:31:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTnWq-0004XZ-G9 for emacs-devel@gnu.org; Sun, 19 Feb 2023 12:31:12 -0500 Original-Received: from mail-oa1-x2f.google.com ([2001:4860:4864:20::2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTnWo-0003ES-RJ; Sun, 19 Feb 2023 12:31:12 -0500 Original-Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-171d9ff4af8so1066810fac.2; Sun, 19 Feb 2023 09:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=EHcU7AzYRn1VhUsQjYAlWvUnrjxhjrjoZo1SHsNYyWg=; b=OecE9CU/oY0bV9GAsD/hd22MFPAPR8BESSvUljHWhRQp2jonDqu4dbnI2aYRAAaMP6 /P/rR0Afmat6bPSAEzpkx+GUPKm5yo8BqJB7OjaPQbg3+xMxadtiRmPuQk5tucxl0iVy 5tHoLELb29App9um18QI3GrDtOKM67hw4AFV2Prp5Fzd2cU3iVAIotlSbM/ExtJRvt2T dG1NknY6SOIfehkpOeAVoJ3wN2BCFmUpjmzqsazuSrWJ1vpAzhYx0cBBtzkx5KljQhu3 zZHp2bXx4S5DgfXdvzut/zFbodJTltIbt0M1MFukTj/1VB6eddXZFG8DYSbjXmxWGiLl rB6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EHcU7AzYRn1VhUsQjYAlWvUnrjxhjrjoZo1SHsNYyWg=; b=CJMt5/jV2hwUEXoi7dFr+Wo/iYCX7JFyjPQ/z/d/bQ68TRQIlrHPlTD9dI2Cloyq/Z hJ0w9jKhO6FIQprz01BWQNsXmdOWpecFxHR3mqWGWTwYPEHfNIBUv2TEK4IyD6lLpPAJ 1BwnZ1rijzN64fq6nefQ1UArcMdJ57NgSPgyBxdFF0NSHqEeCvGEORx91LWtiKsTITYT Sdpg8oCjzPYpsVv7AhgwiZfuxuNwLR0pJ4IgVnIat8hCc/KF+vDmIt7AwesgJnf0hAIx HglSDTFHcqmf9u+z/O3Czb0V9cqno/bIhEmz+DqMr2u8T1gOeUpBnMbif0WEZOFPy+x9 1vdg== X-Gm-Message-State: AO0yUKVUZiejnPJIRhU/N4Re2eMccKLWv8b9S/XmOB4SK7XmEvVa7W5R 6j4bUSIB4COrd79iiGs/J7FAajDwiS+t5TY1aBPUD1uc X-Google-Smtp-Source: AK7set+d+oAlDxVF/scv6Y3PwA5e91eGij7YKSiy8Mv3q+rcKFbyXNpR9SAJXN7ARGP5lV8aOjLTf+Uas/v2p9YKbFs= X-Received: by 2002:a05:6870:968b:b0:16f:edf8:6210 with SMTP id o11-20020a056870968b00b0016fedf86210mr816712oaq.291.1676827869054; Sun, 19 Feb 2023 09:31:09 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 19 Feb 2023 09:31:08 -0800 In-Reply-To: <83h6vhwpop.fsf@gnu.org> X-Hashcash: 1:20:230219:emacs-devel@gnu.org::o9pZzFPH14Q3nDtg:8n1j Received-SPF: pass client-ip=2001:4860:4864:20::2f; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x2f.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, 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:303587 Archived-At: Eli Zaretskii writes: >> ; Merge from origin/emacs-28 >> >> The following commits were skipped: >> >> e339926272a Fix etags local command injection vulnerability >> 5d05ea803e9 Fixed ctags local command execute vulnerability >> 22fb5ff5126 Fix ruby-mode.el local command injection vulnerability (b... >> 807d2d5b3a7 Fix htmlfontify.el command injection vulnerability. >> ae9bfed50db Fix storing email into nnmail by Gnus > > Stefan, why did you merge from emacs-28 to emacs-29? I think it's a > mistake: who knows what this brought to the release branch. We know what this brought though? You can see the full list of changes with "git diff", e.g.: git diff 068b53500e24b7b..ad6c6a3a11569c4 > If the reason was etc/HISTORY, I'd prefer making that change in > emacs-29 by hand instead. Are there any other reasons? Yes, ChangeLog.3, and AUTHORS too. Of course we can copy the files and commit them manually, but AFAIK that's what merge is intended for. It also preserves history and lets us use the same tags on master as on the release branch. What am I missing?