From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#64055: Implementation of modifying VC change comments for Git Date: Tue, 22 Oct 2024 16:29:28 +0800 Message-ID: <87ttd4fslz.fsf@melete.silentflame.com> References: <874j59wym3.fsf@melete.silentflame.com> <868qukl73k.fsf@gnu.org> <87bjzfuzaq.fsf@melete.silentflame.com> <96d49abc-888b-4561-b57d-8d85627e2c42@yandex.ru> <87h696kydj.fsf@melete.silentflame.com> <86wmi2ggko.fsf@gnu.org> <87cyjuj9ds.fsf@melete.silentflame.com> <1e0c5ef6-50cb-46b1-bd3f-ce3b98514257@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6454"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Morgan.J.Smith@outlook.com, Eli Zaretskii , 64055@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Oct 22 10:31:01 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1t3AI4-0001Gt-0y for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 22 Oct 2024 10:30:56 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3AHm-0007uJ-6Z; Tue, 22 Oct 2024 04:30:39 -0400 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 1t3AHj-0007tt-V6 for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 04:30:36 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t3AHi-0000hE-EK for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 04:30:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=j+7uVlXvNLOCRtyiz5i87zX+nNfWACByWgYaQvWnd74=; b=N1CBQDrLxryAmzmd4eZcvHABtRWn6asEX0mWygI4PQbG2tQvlxFsdHKqEHRIohDNuafGzV9JtpoZRRXi7O7hwbwHFK33JkP+elOjzdYEtlknF5RRv9u0yrifbfAsnyZwnHbSYuOs8WrwwaPonjblZ2NHr/lUedZGCMZysPQtjkYo7F3SbXcIcevCSDAeqM3xqiPk+aZMYfqr0V+DldxD/P0PgVkP2y6fbcX8K1P1Z8wkY/lzseAhH0UQ1WPQQgSP3+JOFnokIUeDctIorGKeExMm6mav0YCI/NBIBJ9918EG6Vp0JjjQ8j0qBKeuywuRcUfWtvtprEPgnwDqH/V9Fw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3AI9-0005l2-I3 for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 04:31:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Oct 2024 08:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64055 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64055-submit@debbugs.gnu.org id=B64055.172958580721636 (code B ref 64055); Tue, 22 Oct 2024 08:31:01 +0000 Original-Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 08:30:07 +0000 Original-Received: from localhost ([127.0.0.1]:54555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3AHH-0005cu-0R for submit@debbugs.gnu.org; Tue, 22 Oct 2024 04:30:07 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:53916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3AHE-0005bt-SR for 64055@debbugs.gnu.org; Tue, 22 Oct 2024 04:30:05 -0400 DKIM-Signature: a=rsa-sha256; b=L+mHzqVjt0M2KxcdDZMDtYayyNQ+TFO8JVeGrdw9qT6+0j1yfn6rkMQGSeibZsgcDls3i5HlhruKHMqxq+fId0DLJ70hVs37oUlrgAUZ7g12norQV0EBLBSbxjZu519QSmpQaRsOoSsnA27Yxvpa+AUSdCmbLZE5Yz+juSx+XwTkym/LLJHLOJmGnS7L5dOWehJKPt3ZhMw3nunjV5K2xkOtZzU3mfnY4WbdZ2uikd8T0oiyrMSS8OQI/2dPmmQordyjXh83yLLgWzVaYgCALHVW8SzslSWwy9tM0NXOZ+5m5sYGInvqpssOJTldnsh5Ql2x5+D84oaiqhjpD5SAmw==; s=purelymail2; d=spwhitton.name; v=1; bh=D0SI7xy7ZIUj+RivIUZ7dlR1ehugZOcOJiDIHAIpVMA=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=Z3cysI2xyLiwGopWnaGR6FyDkyXbZO2v29/5BkHZMmYpNDVEYnryTq5i/Wk5q9MWz+aSWwmYrXaTtgTL2G2ss2Ib/I/ek/Pfx7g+tTBUX/U8SsFKzivIHEguC1yypzOWZpgDtGVONow71IPKRIAH5XbA4w9eQUHsxVdBQ1b9hr3Bz2RFz4gSzvz/C/HFbEU8P9e0SWAY9zj/FjJGtBPy444V08ztmq3osHNOlGvw9a/30xBimbF4z8dPnTScCpHX5viHuzhzSxsx5bkV+wUw//cuvjhZ+gGamHF4xzXtb4t5xfe8fn/Nq6fe2h7nCFCoRGWGoBPlXbTvwarPq8E4LA==; s=purelymail2; d=purelymail.com; v=1; bh=D0SI7xy7ZIUj+RivIUZ7dlR1ehugZOcOJiDIHAIpVMA=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 64055@debbugs.gnu.org Original-Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1149823580; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 22 Oct 2024 08:29:31 +0000 (UTC) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id D3BCC7EAD05; Tue, 22 Oct 2024 16:29:28 +0800 (CST) In-Reply-To: <1e0c5ef6-50cb-46b1-bd3f-ce3b98514257@yandex.ru> (Dmitry Gutov's message of "Mon, 21 Oct 2024 20:56:31 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:294094 Archived-At: Hello, On Mon 21 Oct 2024 at 08:56pm +01, Dmitry Gutov wrote: > On 21/10/2024 08:46, Sean Whitton wrote: >> On Mon 21 Oct 2024 at 08:39am +03, Eli Zaretskii wrote: >> >>> Which aspects of "rewriting history" you consider Git-specific? I >>> think any dVCS has the same issues with that, and supports similar >>> workflows, so the concept is relevant to all of them. >> Mainly the terminology. >> If others think it is fine to go ahead and call the defcustom >> vc-allow-rewriting-history, I am happy to do so. > > Speaking of Git terminology, "rewriting history" can refer to both rewriting > published commits (often frowned upon) and rewriting local history (can be > fine and is often encouraged). The proposed name seems to conflate the two > (although the docstring does clarify that it's referring to the former). > > In practice, this also often depends on the upstream branch - e.g. a branch > "feature/xyz" worked on a single developer might be fine with force-pushes. Yeah. I'll use vc-allow-rewriting-published-history. It's not perfect but it does a better job covering these various issues. > I guess my point was we could do with only a prompt warning the user that the > published history will be rewritten (proceeding on if they agree). Showing an > error is a safer choice, but I suppose then the error message could reference > the option to customize. I think that's what's implemented, except for referencing the option name, which I'll add, thanks. -- Sean Whitton