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: Wed, 13 May 2015 19:18:57 +0300 Message-ID: <83zj58jvri.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431534027 15831 80.91.229.3 (13 May 2015 16:20:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 May 2015 16:20:27 +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 Wed May 13 18:20:16 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 1YsZOI-0006lU-63 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 18:20:14 +0200 Original-Received: from localhost ([::1]:50065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZOH-00057Z-He for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 May 2015 12:20:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZOD-00056G-Rm for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:20:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZOA-0006by-LE for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:20:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZOA-0006aR-IH for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:20:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsZO9-0004T1-Sn for bug-gnu-emacs@gnu.org; Wed, 13 May 2015 12:20:06 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 May 2015 16:20: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.143153395917009 (code B ref 20292); Wed, 13 May 2015 16:20:05 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 13 May 2015 16:19:19 +0000 Original-Received: from localhost ([127.0.0.1]:43973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsZNO-0004QF-6m for submit@debbugs.gnu.org; Wed, 13 May 2015 12:19:18 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:56506) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsZNK-0004Pg-RB for 20292@debbugs.gnu.org; Wed, 13 May 2015 12:19:16 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NOA00K00PZPI300@mtaout24.012.net.il> for 20292@debbugs.gnu.org; Wed, 13 May 2015 19:10:21 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOA00IJTQ953G30@mtaout24.012.net.il>; Wed, 13 May 2015 19:10:21 +0300 (IDT) In-reply-to: <55528906.7060606@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:102746 Archived-At: > Cc: monnier@iro.umontreal.ca, esr@snark.thyrsus.com, 20292@debbugs.gnu.org > From: Dmitry Gutov > Date: Wed, 13 May 2015 02:13:10 +0300 > > When a stash contains changes for several files, and "stash pop" encounters conflicts only in some of them, the rest of the files are stages automatically. > > At least, that happens with Git 2.1.0 on my machine I see this with 1.9.5 as well. > What shall we do? Report a bug in Git, I think. It doesn't make sense to have the outcome of "stash pop" wrt the index/staging depend on whether there were conflicts or not, which is what happening here: if I "stash pop" after pulling when none of my local stashed changes are in conflict with the pulled/merged content, I get back modified and unstaged files. Why would the existence of conflicts during "stash pop" produce any different effect for files _without_ conflicts, except by some obscure bug? > Unstage the automatically-staged files? If we can do that, yes. But how do we know which files to unstage? > Revert the changes from this bug? No! That'd be a step back. The current treatment of stashed changes is better than it was before the change. Also note that conflicts like this are quite rare, so the way vc-git worked previously was wrong in 99% of cases, why the one we have now is wrong in perhaps 0.1%. > It seems Git really wants the changes staged after the conflict resolution. It seems to me we've uncovered a bug in Git (gasp!). Git has no reasons to want the changes staged, certainly not depending on whether there were conflicts.