From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii 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 21:49:49 +0300 Message-ID: <83k2wbhu42.fsf@gnu.org> References: <83fv88ta5r.fsf@gnu.org> <5532ADA3.5000006@yandex.ru> <834mod6xnm.fsf@gnu.org> <5532D397.8090602@yandex.ru> <83zj645gxu.fsf@gnu.org> <5533D7B8.7060508@yandex.ru> <83sibw59q1.fsf@gnu.org> <5533E816.2090208@yandex.ru> <83r3rg56zy.fsf@gnu.org> <5533EFE5.2050101@yandex.ru> <83oamk561p.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> <5553F93C.9010205@yandex.ru> <83617vjjmv.fsf@gnu.org> <5554E2C4.7040209@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431629428 2670 80.91.229.3 (14 May 2015 18:50:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 18:50:28 +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 20:50:18 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 1YsyD3-0003Xw-3u for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 20:50:17 +0200 Original-Received: from localhost ([::1]:56318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyD2-0005Wc-Hm for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 14:50:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyCw-0005WH-Mn for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:50:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsyCs-000566-Da for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:50:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyCs-00054y-Ag for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:50:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsyCr-0001u9-GS for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:50:05 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2015 18:50:05 +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.14316294037316 (code B ref 20292); Thu, 14 May 2015 18:50:05 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 18:50:03 +0000 Original-Received: from localhost ([127.0.0.1]:45364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyCn-0001to-EN for submit@debbugs.gnu.org; Thu, 14 May 2015 14:50:02 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:54772) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyCk-0001tX-FB for 20292@debbugs.gnu.org; Thu, 14 May 2015 14:49:59 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NOC00D00S3GEO00@a-mtaout21.012.net.il> for 20292@debbugs.gnu.org; Thu, 14 May 2015 21:49:52 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOC00DGFSB3DB50@a-mtaout21.012.net.il>; Thu, 14 May 2015 21:49:51 +0300 (IDT) In-reply-to: <5554E2C4.7040209@yandex.ru> X-012-Sender: halo1@inter.net.il 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:102802 Archived-At: > Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org > From: Dmitry Gutov > Date: Thu, 14 May 2015 21:00:36 +0300 > > > If we know all the stashed files, how about invoking "git reset" for > > all of them? It cannot hurt, can it? > > How will we know it? Emacs could try to list all staged files, but > there's no good way to know that they all belong to the applied > stash (looking at the top stash isn't reliable either: the user > might have specified a different one explicitly). We could assume that any staged file during resolution of conflict due to "stash pop" is from the stash. If that's too dangerous (is it?), we could ask for confirmation.