Mercurial > emacs
changeset 106463:783bd2552dd4
Make vc-revert change VC state from 'added to 'unregistered.
* vc-git.el (vc-git-revert): Call git reset first.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 06 Dec 2009 21:25:55 +0000 |
| parents | 3affeccb7b33 |
| children | 67d9cb4f16c3 |
| files | lisp/ChangeLog lisp/vc-git.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 06 20:25:36 2009 +0000 +++ b/lisp/ChangeLog Sun Dec 06 21:25:55 2009 +0000 @@ -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 :
--- a/lisp/vc-git.el Sun Dec 06 20:25:36 2009 +0000 +++ b/lisp/vc-git.el Sun Dec 06 21:25:55 2009 +0000 @@ -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