From: Jambunathan K <kjambunathan@gmail.com>
To: "Sébastien Vauban"
<public-wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@plane.gmane.org>
Cc: public-help-gnu-emacs-mXXj517/zsQ@plane.gmane.org
Subject: Re: Git never commits, Magit never pushes
Date: Tue, 05 Apr 2011 21:46:18 +0530 [thread overview]
Message-ID: <81ipusoer1.fsf@gmail.com> (raw)
In-Reply-To: <80ipusudbg.fsf@somewhere.org> ("Sébastien Vauban"'s message of "Tue, 05 Apr 2011 13:50:43 +0200")
>> 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
--
next prev parent reply other threads:[~2011-04-05 16:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-02 7:18 Git never commits, Magit never pushes Sébastien Vauban
2011-04-02 7:55 ` Jambunathan K
2011-04-02 14:05 ` Ian Barton
2011-04-03 20:51 ` PJ Weisberg
[not found] ` <mailman.7.1301730983.4225.help-gnu-emacs@gnu.org>
2011-04-03 8:09 ` Sébastien Vauban
2011-04-03 9:15 ` Jambunathan K
[not found] ` <mailman.13.1301822571.7560.help-gnu-emacs@gnu.org>
2011-04-05 11:50 ` Sébastien Vauban
2011-04-05 16:16 ` Jambunathan K [this message]
2011-04-05 16:23 ` Jambunathan K
2011-04-05 6:30 ` PJ Weisberg
[not found] ` <mailman.0.1301985049.6502.help-gnu-emacs@gnu.org>
2011-04-05 12:01 ` Sébastien Vauban
2011-04-15 20:14 ` PJ Weisberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81ipusoer1.fsf@gmail.com \
--to=kjambunathan@gmail.com \
--cc=public-help-gnu-emacs-mXXj517/zsQ@plane.gmane.org \
--cc=public-wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@plane.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.