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: Fri, 10 Apr 2015 15:55:44 +0300 Message-ID: <83fv88ta5r.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428670651 18385 80.91.229.3 (10 Apr 2015 12:57:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 10 Apr 2015 12:57:31 +0000 (UTC) Cc: "Eric S. Raymond" To: 20292@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 10 14:57:15 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 1YgYUl-0008Di-A4 for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Apr 2015 14:57:15 +0200 Original-Received: from localhost ([::1]:39210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYUk-0008U3-H4 for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Apr 2015 08:57:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYUg-0008Tm-QA for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:57:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgYUc-0002SS-AC for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:57:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYUc-0002SO-6W for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:57:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YgYUb-0006Cj-M0 for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:57: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: Fri, 10 Apr 2015 12:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.142867056323770 (code B ref -1); Fri, 10 Apr 2015 12:57:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Apr 2015 12:56:03 +0000 Original-Received: from localhost ([127.0.0.1]:51930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgYTZ-0006BG-Hk for submit@debbugs.gnu.org; Fri, 10 Apr 2015 08:56:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42586) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgYTW-0006Ax-HU for submit@debbugs.gnu.org; Fri, 10 Apr 2015 08:55:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgYTQ-0001td-2R for submit@debbugs.gnu.org; Fri, 10 Apr 2015 08:55:53 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:60248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYTQ-0001tZ-0J for submit@debbugs.gnu.org; Fri, 10 Apr 2015 08:55:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYTO-00075V-LK for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:55:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgYTJ-0001s6-T7 for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:55:50 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:41950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgYTJ-0001rl-DV for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 08:55:45 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NML00100CTDIV00@mtaout25.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 10 Apr 2015 15:51:10 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NML001R8D1AE200@mtaout25.012.net.il>; Fri, 10 Apr 2015 15:51:10 +0300 (IDT) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:101379 Archived-At: >From the shell prompt type "git stash save" to stash uncommitted changes. Then "git pull" or "git merge" from upstream, and finally type "git stash pop" to restore your original changes. If "git stash pop" encounters merge conflicts, then resolving these conflicts in Emacs and saving the buffer will run "git add" for the file whose conflicts were resolved. But that is not TRT in this case; the user likely does not expect to have her uncommitted changes staged for the next commit. Therefore, I think vc-git-resolve-when-done should not run "git add" if the merge conflict was due to "git stash pop". In GNU Emacs 24.5.1 (i686-pc-mingw32) of 2015-03-27 on HOME-C4E4A596F7 Windowing system distributor `Microsoft Corp.', version 5.1.2600 Configured using: `configure --prefix=/d/usr 'CFLAGS=-Og -gdwarf-4 -g3'' Important settings: value of $LANG: ENU locale-coding-system: cp1255 Major mode: RMAIL Minor modes in effect: diff-auto-refine-mode: t desktop-save-mode: t show-paren-mode: t display-time-mode: t tooltip-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t temp-buffer-resize-mode: t buffer-read-only: t line-number-mode: t Recent messages: Getting mail from d:/usr/eli/data/mail.new... Counting new messages...done (12) Saving file d:/usr/eli/rmail/INBOX... Wrote d:/usr/eli/rmail/INBOX [2 times] Computing summary lines...done 12 new messages read Mark set No following nondeleted message Saving file d:/usr/eli/rmail/INBOX... Wrote d:/usr/eli/rmail/INBOX [2 times] Load-path shadows: d:/usr/share/emacs/site-lisp/soap-inspect hides d:/usr/share/emacs/24.5/lisp/net/soap-inspect d:/usr/share/emacs/site-lisp/soap-client hides d:/usr/share/emacs/24.5/lisp/net/soap-client Features: (shadow emacsbug etags smerge-mode cc-awk bug-reference add-log misearch multi-isearch dabbrev shr-color color mule-util rmailout shr browse-url network-stream starttls tls mail-extr smtpmail auth-source eieio byte-opt bytecomp byte-compile cconv eieio-core password-cache mailalias sendmail help-mode cl-extra texinfo ld-script tcl conf-mode org-element org-rmail org-mhe org-irc org-info org-gnus gnus-util org-docview doc-view image-mode dired-x dired org-bibtex bibtex org-bbdb org-w3m org advice org-macro org-footnote org-pcomplete pcomplete org-list org-faces org-entities org-version ob-emacs-lisp ob ob-tangle ob-ref ob-lob ob-table ob-exp org-src ob-keys ob-comint comint ansi-color ring ob-core ob-eval org-compat org-macs org-loaddefs find-func cal-menu calendar cal-loaddefs arc-mode archive-mode parse-time diff-mode vc-bzr sh-script smie executable generic make-mode noutline outline easy-mmode vc-cvs jka-compr bat-mode vc-dispatcher vc-svn flyspell info vc-git cc-langs rmailsum qp rmailmm message format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mailabbrev gmm-utils mailheader mail-parse rfc2231 rmail rfc2047 rfc2045 ietf-drums mm-util help-fns mail-prsvr mail-utils desktop frameset server filecache mairix cus-edit cus-start cus-load wid-edit cl-loaddefs cl-lib saveplace midnight ispell generic-x cc-mode cc-fonts easymenu cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs paren battery time time-date tooltip electric uniquify ediff-hook vc-hooks lisp-float-type mwheel dos-w32 ls-lisp w32-common-fns disp-table w32-win w32-vars tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process w32notify w32 multi-tty emacs) Memory information: ((conses 8 1513834 148516) (symbols 32 42131 0) (miscs 32 5809 4393) (strings 16 105774 18210) (string-bytes 1 3133483) (vectors 8 37368) (vector-slots 4 1563878 83782) (floats 8 326 1158) (intervals 28 269674 1601) (buffers 508 358))