[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-git.el
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-git.el |
Date: |
Sun, 06 Dec 2009 21:25:59 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 09/12/06 21:25:59
Modified files:
lisp : ChangeLog vc-git.el
Log message:
Make vc-revert change VC state from 'added to 'unregistered.
* vc-git.el (vc-git-revert): Call git reset first.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16846&r2=1.16847
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.102&r2=1.103
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16846
retrieving revision 1.16847
diff -u -b -r1.16846 -r1.16847
--- ChangeLog 6 Dec 2009 20:25:36 -0000 1.16846
+++ ChangeLog 6 Dec 2009 21:25:55 -0000 1.16847
@@ -1,3 +1,8 @@
+2009-12-06 Dan Nicolaescu <address@hidden>
+
+ Make vc-revert change VC state from 'added to 'unregistered.
+ * vc-git.el (vc-git-revert): Call git reset first.
+
2009-12-06 Ulf Jasper <address@hidden>
* net/newst-backend.el :
Index: vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- vc-git.el 3 Dec 2009 04:08:12 -0000 1.102
+++ vc-git.el 6 Dec 2009 21:25:58 -0000 1.103
@@ -535,7 +535,8 @@
"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 "checkout" "HEAD")))
+ (vc-git-command nil 0 file "reset" "-q" "--")
+ (vc-git-command nil nil file "checkout" "-q" "--")))
;;; HISTORY FUNCTIONS
- [Emacs-diffs] emacs/lisp ChangeLog vc-git.el,
Dan Nicolaescu <=