From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: On the adoption of transient.el Date: Wed, 11 Aug 2021 09:58:41 +0300 Organization: LINKOV.NET Message-ID: <87mtpoh69a.fsf@mail.linkov.net> References: <877di4on3d.fsf@posteo.net> <87im1oy6mw.fsf@posteo.net> <87y29hihea.fsf@posteo.net> <87sfzonu6k.fsf@ucl.ac.uk> <878s1gqlop.fsf@gmail.com> <8735ronpo0.fsf@ucl.ac.uk> <83lf5gjgtp.fsf@gnu.org> <87eeb8gdbq.fsf@telefonica.net> <877dgzebux.fsf@mail.linkov.net> <87eeb2aq2z.fsf@mail.linkov.net> <77d47675-a981-e181-9327-47763cf59e19@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="29498"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 11 09:08:08 2021 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 1mDiLQ-0007Xv-1g for ged-emacs-devel@m.gmane-mx.org; Wed, 11 Aug 2021 09:08:08 +0200 Original-Received: from localhost ([::1]:56362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDiLP-00026b-0N for ged-emacs-devel@m.gmane-mx.org; Wed, 11 Aug 2021 03:08:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDiJK-0007bs-9v for emacs-devel@gnu.org; Wed, 11 Aug 2021 03:05:58 -0400 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:33501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDiJF-00024p-Bm for emacs-devel@gnu.org; Wed, 11 Aug 2021 03:05:58 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 29387C0009; Wed, 11 Aug 2021 07:05:49 +0000 (UTC) In-Reply-To: <77d47675-a981-e181-9327-47763cf59e19@yandex.ru> (Dmitry Gutov's message of "Tue, 10 Aug 2021 15:40:38 +0300") Received-SPF: pass client-ip=217.70.183.198; envelope-from=juri@linkov.net; helo=relay6-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 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:272315 Archived-At: >>> - Let the user edit a diff in the diff-mode buffer >>> - Save it to a file >>> - 'git apply --cached', to put the contents to the staging area >>> - 'git commit' >> But these commands don't perform a merge when committing a patch >> with changes in the same file. So afterwards `git diff` will show >> the reversed diff for already committed changes. > > Sorry, I don't understand. Could you explain the scenario in more detail? This is the shortest test case: 1. make changes in one part of a file 2. create a patch with changes in another part of the same file 3. git apply --cached a.patch 4. git commit -m "Apply a.patch" 5. git commit -a -m "Commit original file changes" The last commit reverts the changes committed from the patch.