From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Thu, 14 May 2015 16:55:50 -0400 Message-ID: References: <83fv88ta5r.fsf@gnu.org> <5533F446.4020400@yandex.ru> <83fv7u6epr.fsf@gnu.org> <838udm61ur.fsf@gnu.org> <5536FE56.406@yandex.ru> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.fsf@gnu.org> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@gnu.org> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.fsf@gnu.org> <5554F2F3.6010109@yandex.ru> <83fv6zhs3j.fsf@gnu.org> <55550482.1020404@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1431636985 2126 80.91.229.3 (14 May 2015 20:56:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 20:56:25 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 14 22:56:12 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yt0At-0007Yz-45 for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 22:56:11 +0200 Original-Received: from localhost ([::1]:56737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt0As-00018O-JS for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 16:56:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt0Ap-00018C-2H for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 16:56:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yt0Al-0002Ay-Qx for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 16:56:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt0Al-0002A6-Mk for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 16:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yt0Al-00053O-3c for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 16:56:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2015 20:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20292-submit@debbugs.gnu.org id=B20292.143163696019417 (code B ref 20292); Thu, 14 May 2015 20:56:03 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 20:56:00 +0000 Original-Received: from localhost ([127.0.0.1]:45438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yt0Ah-000536-Al for submit@debbugs.gnu.org; Thu, 14 May 2015 16:55:59 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:6706) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yt0Ae-00052t-MQ for 20292@debbugs.gnu.org; Thu, 14 May 2015 16:55:57 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXYBBVYeBRALDiYHCxQYDSSqJIt7cgMBAoM+AwMLBAqDVASjY4RY X-IPAS-Result: AgUFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXYBBVYeBRALDiYHCxQYDSSqJIt7cgMBAoM+AwMLBAqDVASjY4RY X-IronPort-AV: E=Sophos;i="5.11,557,1422939600"; d="scan'208";a="119859784" Original-Received: from 69-165-139-108.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([69.165.139.108]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 14 May 2015 16:55:51 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id A1488AE129; Thu, 14 May 2015 16:55:50 -0400 (EDT) In-Reply-To: <55550482.1020404@yandex.ru> (Dmitry Gutov's message of "Thu, 14 May 2015 23:24:34 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:102812 Archived-At: I think the only sane way to handle this is to always use "git add" and to add a config var so users who don't like it can disable it. After all, when unstashing changes in a file that already has a modification staged, Git is pretty happy to silently/automatically "git add" the resulting merge (hence throwing away the info about the particular changes that were staged before the unstash) if it doesn't have conflicts (at least it does so if the unstash finds conflicts in other files). So I don't see why Emacs shouldn't feel free to "git add" the file once conflicts are resolved. IOW, I think bug#20292 is simply not a bug. Stefan