Make vc-revert change VC state from 'added to 'unregistered.

* vc-git.el (vc-git-revert): Call git reset first.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 712507bcea38e55650e505630d116f3d62d93411..38a9a1c0817924b986a2ae84a141aa5360a61e6a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       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  <ulf.jasper@web.de>
 
        * net/newst-backend.el :

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index a33a0f51d7d5769164a5c0270995d31bd9de25af..f44679d43333bd251770b1d7f5f6b09254cc420c 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -535,7 +535,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   "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