From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov 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 02:57:24 +0300 Message-ID: <555687E4.8070605@yandex.ru> References: <83fv88ta5r.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> <83bnhmia75.fsf@gnu.org> <83mw15hdqn.fsf@gnu.org> <83iobth9uw.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1431734305 27296 80.91.229.3 (15 May 2015 23:58:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 15 May 2015 23:58:25 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Stefan Monnier , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 16 01:58: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 1YtPUa-0000bw-Fg for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 01:58:12 +0200 Original-Received: from localhost ([::1]:33249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtPUZ-0005Gg-OX for geb-bug-gnu-emacs@m.gmane.org; Fri, 15 May 2015 19:58:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtPUW-0005Gb-Sk for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 19:58:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtPUR-0007qZ-Pr for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 19:58:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtPUR-0007qN-Mp for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 19:58:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YtPUQ-0005HN-Ay for bug-gnu-emacs@gnu.org; Fri, 15 May 2015 19:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 15 May 2015 23:58: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.143173425620260 (code B ref 20292); Fri, 15 May 2015 23:58:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 15 May 2015 23:57:36 +0000 Original-Received: from localhost ([127.0.0.1]:46585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtPTz-0005Gh-Ca for submit@debbugs.gnu.org; Fri, 15 May 2015 19:57:35 -0400 Original-Received: from mail-wi0-f171.google.com ([209.85.212.171]:34657) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtPTx-0005GV-OT for 20292@debbugs.gnu.org; Fri, 15 May 2015 19:57:34 -0400 Original-Received: by wicmc15 with SMTP id mc15so49495489wic.1 for <20292@debbugs.gnu.org>; Fri, 15 May 2015 16:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=vpFZdJJEsnetFPew5nSFJiGfQlxIuhOsw/I731un7Qo=; b=y99PG2UKl7fKEG4kV0Uou/AHH0odJv/pqTJxUmCzKKkebV5XjpvBO5cBK5edCz1hGA ajnDL+LF8jlsz+CBQO6LUNr3XUjazslL8/dU5YUDFQqBSDkVA+C1qsAUICwyonTEiPQ5 d9cH6G86W98MtvX2Bo+G2PbXOKnx+R2ZHtpqkIZMlpv74D9vbSYYTeXwJibIaamiElaC /wb5KbWAcdRX1VnjvLpTMcdUF17X9uZp31zyTp0UE6hAt6I/qXjTU+puLJJoQyXyCmWq 9MLPTgTXwRnWi46MM2FLT2tcaRd3EEyUHpa5E3Mn8XMfEc6IwOYDIQwuLFPC6I7UnaGW xk0g== X-Received: by 10.194.77.44 with SMTP id p12mr23193475wjw.1.1431734248141; Fri, 15 May 2015 16:57:28 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id 16sm4764155wjs.41.2015.05.15.16.57.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 May 2015 16:57:28 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: 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:102855 Archived-At: On 05/16/2015 02:52 AM, Stefan Monnier wrote: > but indeed we > could make it into a 3-way choice between "git add", "git reset", > and "do nothing"). You've read my mind. :) > whether there were > staged changes before the command was run We'll just ignore this. > and AFAIK those > cases can't be distinguished solely based on the state of the current > file but also depend on the other files in the project. That's not a problem, we have vc-git-root.