all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Sébastien Vauban" <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org>
To: help-gnu-emacs-mXXj517/zsQ@public.gmane.org
Subject: Git never commits, Magit never pushes
Date: Sat, 02 Apr 2011 09:18:04 +0200	[thread overview]
Message-ID: <807hbdceab.fsf@somewhere.org> (raw)

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


             reply	other threads:[~2011-04-02  7:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-02  7:18 Sébastien Vauban [this message]
2011-04-02  7:55 ` Git never commits, Magit never pushes 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

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=807hbdceab.fsf@somewhere.org \
    --to=wxhgmqzgwmuf-genee64ty+gs+fvcfc7uqw@public.gmane.org \
    --cc=help-gnu-emacs-mXXj517/zsQ@public.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.