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: Sat, 16 May 2015 09:53:12 -0400 Message-ID: References: <83fv88ta5r.fsf@gnu.org> <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> <55568661.90506@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1431784461 30463 80.91.229.3 (16 May 2015 13:54:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2015 13:54:21 +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 Sat May 16 15:54:11 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 1YtcXa-0003Bm-5s for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 15:54:10 +0200 Original-Received: from localhost ([::1]:34729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtcXZ-00078K-FY for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 09:54:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtcXW-00078F-Gz for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:54:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtcXT-0003PH-8o for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:54:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtcXT-0003PD-4w for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:54:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YtcXS-0004CU-VR for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:54: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: Sat, 16 May 2015 13:54:02 +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.143178440116072 (code B ref 20292); Sat, 16 May 2015 13:54:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 16 May 2015 13:53:21 +0000 Original-Received: from localhost ([127.0.0.1]:46874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtcWm-0004BA-Jt for submit@debbugs.gnu.org; Sat, 16 May 2015 09:53:20 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:32195) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtcWk-0004Au-K7 for 20292@debbugs.gnu.org; Sat, 16 May 2015 09:53:18 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgUFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLDiYHCxQYDSSIE6IRjGQJAwECgz4DDgQKg1QEo2OEWA X-IPAS-Result: AgUFAGvvdVRFpYts/2dsb2JhbAA3gVOhb4EIgXUBAQQBVh4FBQsLDiYHCxQYDSSIE6IRjGQJAwECgz4DDgQKg1QEo2OEWA X-IronPort-AV: E=Sophos;i="5.11,557,1422939600"; d="scan'208";a="120190259" Original-Received: from 69-165-139-108.dsl.teksavvy.com (HELO pastel.home) ([69.165.139.108]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 16 May 2015 09:53:14 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id D82112608; Sat, 16 May 2015 09:53:12 -0400 (EDT) In-Reply-To: <55568661.90506@yandex.ru> (Dmitry Gutov's message of "Sat, 16 May 2015 02:50:57 +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:102877 Archived-At: > If we're fine with a config var, we might as well try to support the > alternative behavior. This should do it: Looks OK to me. > + :group 'vc-git) This is redundant. > + (when (and > + (eq vc-git-resolve-conflicts 'unstage) > + ;; Doing something other than a merge. Likely applying a > + ;; stash (bug#20292). > + (not > + (file-exists-p (expand-file-name ".git/MERGE_HEAD" > + (vc-git-root > buffer-file-name)))) > + (not (vc-git-conflicted-files (vc-git-root > buffer-file-name)))) If you switch to "(unless (or ..." you'll get rid of one "not". Stefan