GNU bug report logs - #6249
23.2: vc-revert don't works in git

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 6249 in the body.
You can then email your comments to 6249 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mario Castelan Castro <marioxcc <at> gnu.org>
To: bug-gnu-emacs <at> gnu.org
Cc: marioxcc <at> gnu.org
Subject: 23.2: vc-revert don't works in git
Date: Sat, 22 May 2010 13:58:59 -0500

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
NotDashEscaped: You need GnuPG to verify this message

May 22th 2010 in bug-gnu-emacs <at> gnu.org thread "23.2: vc-revert don't
works in git"

Hi.

I found a possible bug:

Running M-x vc-revert from a buffer displaying a GIT-versioned file
with non commited changes gives a message like this, for each modified
file:

FILE: needs update

I.e: If the only modified file, wich I want to revert is program.c i get:

program.c: needs update

If there are more modified files, the message lists all them (I'ts the
same message if I run M-x vc-revert from program.c, program.h or
*vc-dir*).

program.c: needs update
program.h: needs update

Removing a line from vc-git.el appears to fix the problem.  This line
was added after 23.1 but before 23.2.  23.1 didn't gave this problem.
Here is the "patch" than removes the lines (Made againsting the BZR
revision 100413):

=== modified file 'lisp/vc-git.el'
*** lisp/vc-git.el	2010-04-21 02:05:24 +0000
--- lisp/vc-git.el	2010-05-22 18:43:28 +0000
*************** or an empty string if none."
*** 577,583 ****
    "Revert FILE to the version stored in the git repository."
    (if contents-done
        (vc-git-command nil 0 file "update-index" "--")
-     (vc-git-command nil 0 file "reset" "-q" "--")
      (vc-git-command nil nil file "checkout" "-q" "--")))
  
  ;;; HISTORY FUNCTIONS
--- 577,582 ----

Regards and thanks.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEAREIAAYFAkv4KUUACgkQZ4DA0TLic4gZIwCfWABBFCX9Ae5UT2KApGWrWMzy
RZAAnjtzDQNQ8zGhAcZCHRYkDsSjj37D
=I8j7
-----END PGP SIGNATURE-----

Message #8 received at 6249 <at> debbugs.gnu.org (full text, mbox):

From: Dan Nicolaescu <dann <at> gnu.org>
To: Mario Castelan Castro <marioxcc <at> gnu.org>
Cc: 6249 <at> debbugs.gnu.org
Subject: Re: bug#6249: 23.2: vc-revert don't works in git
Date: Sun, 23 May 2010 15:49:12 -0400

Mario Castelan Castro <marioxcc <at> gnu.org> writes:

> NotDashEscaped: You need GnuPG to verify this message
>
> May 22th 2010 in bug-gnu-emacs <at> gnu.org thread "23.2: vc-revert don't
> works in git"
>
> Hi.
>
> I found a possible bug:
>
> Running M-x vc-revert from a buffer displaying a GIT-versioned file
> with non commited changes gives a message like this, for each modified
> file:
>
> FILE: needs update
>
> I.e: If the only modified file, wich I want to revert is program.c i get:
>
> program.c: needs update
>
> If there are more modified files, the message lists all them (I'ts the
> same message if I run M-x vc-revert from program.c, program.h or
> *vc-dir*).


I can't reproduce this.
Can you please describe step by step what you are doing, starting with 
emacs -Q?

Message #11 received at 6249 <at> debbugs.gnu.org (full text, mbox):

From: Mario Castelan Castro <marioxcc <at> gnu.org>
To: Dan Nicolaescu <dann <at> gnu.org>
Cc: marioxcc <at> gnu.org, 6249 <at> debbugs.gnu.org
Subject: Re: bug#6249: 23.2: vc-revert don't works in git
Date: Wed, 26 May 2010 15:27:43 -0500

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

May 26th 2010 for Dan Nicolaescu <dann <at> gnu.org> copy in
6249 <at> debbugs.gnu.org thread "bug#6249: 23.2: vc-revert don't works in
git".

Hi Dan.

Please excuse my late reponse.  I got a bit busy.

I just installed git 1.7.1, and this appears to fix the problem too,
more likely it's a bug or design change in GIT what makes vc-revert
don't work with the old GIT version.

When I had the problem I was using GIT 1.5.6.5 (The one than comes
with debian lenny.

Regards and thanks.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEAREIAAYFAkv9hDcACgkQZ4DA0TLic4igigCfX/06SOKW7ghIfU2FM5IqhLSA
nKwAn33pgUS25O/C8kOKRhFymM+umyXO
=ntZI
-----END PGP SIGNATURE-----

Message #16 received at 6249-done <at> debbugs.gnu.org (full text, mbox):

From: Dan Nicolaescu <dann <at> gnu.org>
To: Mario Castelan Castro <marioxcc <at> gnu.org>
Cc: 6249-done <at> debbugs.gnu.org
Subject: Re: bug#6249: 23.2: vc-revert don't works in git
Date: Tue, 01 Jun 2010 03:09:36 -0400

Mario Castelan Castro <marioxcc <at> gnu.org> writes:

> May 26th 2010 for Dan Nicolaescu <dann <at> gnu.org> copy in
> 6249 <at> debbugs.gnu.org thread "bug#6249: 23.2: vc-revert don't works in
> git".
>
> Hi Dan.
>
> Please excuse my late reponse.  I got a bit busy.
>
> I just installed git 1.7.1, and this appears to fix the problem too,

Closing the bug then.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.