From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 15:58:05 +0300 Message-ID: <83sicen34y.fsf@gnu.org> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> <5521068C.1000508@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428238716 4574 80.91.229.3 (5 Apr 2015 12:58:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 12:58:36 +0000 (UTC) Cc: stephen@xemacs.org, sorganov@gmail.com, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 14:58:31 2015 Return-path: Envelope-to: ged-emacs-devel@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 1Yek8D-0004Gf-UA for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:58:30 +0200 Original-Received: from localhost ([::1]:36313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek8D-0006g9-CP for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 08:58:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek80-0006ft-RH for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:58:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yek7v-0003g5-Ve for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:58:16 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:34410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yek7v-0003fq-Nr for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:58:11 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NMC00D003GLHC00@mtaout25.012.net.il> for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:53:22 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC004CZ3SYQ990@mtaout25.012.net.il>; Sun, 05 Apr 2015 15:53:22 +0300 (IDT) In-reply-to: <5521068C.1000508@math.ntnu.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184921 Archived-At: > Date: Sun, 05 Apr 2015 11:55:24 +0200 > From: Harald Hanche-Olsen > CC: "Stephen J. Turnbull" , sorganov@gmail.com, > emacs-devel@gnu.org > > Eli Zaretskii wrote: > > Yes, something like that. In fact, I think the root cause of the > > original problem was that "C-x v v", which tried to commit a single > > file in the middle of a merge. Instead, the correct action is either > > 'v' from vc-dir or "git commit" from the shell prompt. > > > > It would be good if "C-x v v" tried to support this situation better. > > I hope Eric Raymond is reading this. > > You need to detect the fact that a merge is underway. Is the existence > of .git/MERGE_HEAD a reliable indicator of this? I think so, but I hope some Git expert will answer that.