From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jambunathan K Newsgroups: gmane.emacs.help Subject: Re: Git never commits, Magit never pushes Date: Tue, 05 Apr 2011 21:46:18 +0530 Message-ID: <81ipusoer1.fsf@gmail.com> References: <807hbdceab.fsf@somewhere.org> <80wrjb69je.fsf@somewhere.org> <80ipusudbg.fsf@somewhere.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1302020283 18538 80.91.229.12 (5 Apr 2011 16:18:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 5 Apr 2011 16:18:03 +0000 (UTC) Cc: public-help-gnu-emacs-mXXj517/zsQ@plane.gmane.org To: =?iso-8859-1?Q?S=E9bastien?= Vauban Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Apr 05 18:17:59 2011 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q78wg-0005wx-Bo for geh-help-gnu-emacs@m.gmane.org; Tue, 05 Apr 2011 18:17:58 +0200 Original-Received: from localhost ([127.0.0.1]:34077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q78wc-0003l5-Hm for geh-help-gnu-emacs@m.gmane.org; Tue, 05 Apr 2011 12:17:30 -0400 Original-Received: from [140.186.70.92] (port=42592 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q78w4-0003jD-Ml for help-gnu-emacs@gnu.org; Tue, 05 Apr 2011 12:16:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q78vx-0001ce-IV for help-gnu-emacs@gnu.org; Tue, 05 Apr 2011 12:16:50 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:53315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q78vx-0001bs-85 for help-gnu-emacs@gnu.org; Tue, 05 Apr 2011 12:16:49 -0400 Original-Received: from public by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Q78vs-0006vf-Pn for help-gnu-emacs@gnu.org; Tue, 05 Apr 2011 18:16:44 +0200 Original-Received: from mail-iw0-f172.google.com ([209.85.214.172]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q78vl-0006sG-PD; Tue, 05 Apr 2011 18:16:37 +0200 Original-Received: by iwn39 with SMTP id 39so815366iwn.17 for ; Tue, 05 Apr 2011 09:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=z6hsLjfioCOOIpL04xUEf+sw4FQ7xzmCAXPMjPmhqIo=; b=Ou+yKnLHQzJQxrRewBTccaSQ14DKFiuF+NkYUAEorO1/rBjQUK9YZgkxMw5dSpdLrW PznazSN3KBH/RpO5EEBU1VE9vzwMn65EKui+2/nBSM7UZz/mo20MJuTg5K89qvmuYno4 28fsjgBWH8KnNy6cRFFY2+osAhoTsuFZPPLrE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=hMJQnGBv1pjjSL25PM7IqT+tccE0UJP04O5zVUkZJ/CKChVAYEiS5uyX6w+MjmI178 /6yw+90MMuRo+c26Er+gTo/ISl8VtG/DOo+za6P7xNO+PuJEOXtALfh1x7MLar68QP2b 2UaMmh5koKWFjbhKYehC8SRw6r803I3tdZpY0= Original-Received: by 10.43.70.84 with SMTP id yf20mr2423256icb.161.1302020195879; Tue, 05 Apr 2011 09:16:35 -0700 (PDT) Original-Received: from JAMBU-NETBOOK ([115.184.23.5]) by mx.google.com with ESMTPS id xi12sm4255826icb.18.2011.04.05.09.16.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Apr 2011 09:16:34 -0700 (PDT) In-Reply-To: <80ipusudbg.fsf@somewhere.org> (=?iso-8859-1?Q?=22S=E9bastien?= Vauban"'s message of "Tue, 05 Apr 2011 13:50:43 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (windows-nt) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:80619 Archived-At: >> Now "x" on a vc-dir would hide update and unregistered files. (It will >> only show added/modified files) >> >> "C-x C-v =" on a version controlled buffer would launch ediff window. > > You meant "C-x v =", I guess. Yes. C-x v =. > >> I have been using this setup for a while so I know it works. If something is >> broken it is possible that I haven't copy/pasted some stuff from my init >> file. >> >> [...] > > My test on an "edited" file: > > VC backend : Git > Working dir: c:/home/sva/src/ > Branch : master > Remote : git-VglghZ3J0L77m/ziVfR4gQ@public.gmane.org:src/src.git > Stash : Nothing stashed > > ./ > org/ > edited org/about.org > > gives the following error: > > Debugger entered--Lisp error: (wrong-type-argument stringp nil) > expand-file-name(nil) > find-file-noselect(nil nil nil nil) > find-file(nil) > my-ediff-revision(nil "HEAD" "") > (lambda nil (interactive) (my-ediff-revision (buffer-file-name) (read-string "revision? " "HEAD" nil "HEAD") ""))() > call-interactively((lambda nil (interactive) (my-ediff-revision (buffer-file-name) (read-string "revision? " "HEAD" nil "HEAD") ""))) > my-vc-diff(nil) > call-interactively(my-vc-diff nil nil) Looks like you are doing `C-x v =' from vc-dir buffer. That's why it is unable to identify a filename. Use the above command from within `about.org' buffer - the buffer that is modified. > >>> I did not find yet, though, how to push it to the Git repo. >> >> C-x v v commits to the local branch. I generally push to the remote repo >> from the shell. > > BTW, does using the "vc" backend for Git allow you as well to use exactly the > same key bindings for other backends (SVN, CVS)? That's correct. Over the course of years I have used essentially the same interface/keybinding with cvs, svn, perforce, mercurial, clearcase and now git. This way I don't have to ever remember the backend specific commands for committing etc etc. And it is always a good idea to use packages that come with regular emacs. I have found vc-git.el satisfactory for my needs. Btw if you customize `vc-command-messages' to t then you can see what backend command vc is issuing. This is good way to explore the backend. > > Best regards, > Seb --