unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
* Git never commits, Magit never pushes
@ 2011-04-02  7:18 Sébastien Vauban
  2011-04-02  7:55 ` Jambunathan K
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Sébastien Vauban @ 2011-04-02  7:18 UTC (permalink / raw)
  To: help-gnu-emacs-mXXj517/zsQ

Hello,

I try using git (from git.el, in git-contrib-emacs, downloaded from Git's Web
site) to manage my files.

I can add "Unknown" files, that works (with `a', then my log message, followed
by `C-c C-c'). They get the new status "Uptodate".

However, I cannot *commit* "Modified" files from Emacs (with `c', then my log
message, followed by `C-c C-c'):

--8<---------------cut here---------------start------------->8---
Running git commit...
error: css/leuven.css: cannot add to the index - missing --add option?
fatal: Unable to process path css/leuven.css
--8<---------------cut here---------------end--------------->8---

Doing the commit "by hand" from the command line (Bash) works:

--8<---------------cut here---------------start------------->8---
git commit css/leuven.css -m "Fix colors."
--8<---------------cut here---------------end--------------->8---

When refreshing the `*git-status*' buffer (with `g'), I see the file as
"Uptodate".

So, something seems wrong with the commit command used by git.el?

I'm reluctant to use Magit, as I loose the interactive ediff feature
(confirmed?), which I'm fond of, but OK...

There I can perfectly stage files and even commit them. But I cannot *push*
them: the command never returns, it never completes its work (stays "git push"
in the modeline).

Once again, that works without any problems from the command line interface...

So, to wrap it up:

- with git.el, I can't commit
- with magit.el, I can't push

Any idea on how to solve the first (my favorite, for getting ediff) or both
problems?

My environment:

- GNU Emacs 23.1.50.1 (i386-mingw-nt5.1.2600) of 2009-10-14 on LENNART-69DE564
  (patched)
- Windows XP SP3
- Cygwin 1.7.something
- C:/cygwin/bin/git version 1.7.4
- Intel Core 2 Duo T5600 @ 1.83 GHz
- 2 GB RAM
- files on local C: disk (NTFS)

Best regards,
  Seb

-- 
Sébastien Vauban


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2011-04-15 20:14 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).