aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu <[email protected]>2007-07-23 20:56:13 +0000
committerDan Nicolaescu <[email protected]>2007-07-23 20:56:13 +0000
commitd7009f45d8f4a5bb98790664290e8ef535dd74f0 (patch)
tree5cdb7c8690799cba02a02a95f543aa8fb30992df
parentf310189cfa994132b42033dd82b81c5159a67fd5 (diff)
(vc-git-unregister): New function.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-git.el6
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09572aa1cd..7e3b2f3cbf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2007-07-23 Alexandre Julliard <[email protected]>
- * vc-git.el (vc-git-delete-file, vc-git-rename-file): New functions.
+ * vc-git.el (vc-git-delete-file, vc-git-rename-file)
+ (vc-git-unregister): New functions.
(vc-git-find-version): Use the result of ls-files as a parameter
for cat-file
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index d65d8428e6..de6be9af73 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -66,7 +66,7 @@
;; - responsible-p (file) OK
;; - could-register (file) NEEDED
;; - receive-file (file rev) ??
-;; - unregister (file) NEEDED
+;; - unregister (file) OK
;; * checkin (files rev comment) OK
;; * find-version (file rev buffer) OK
;; * checkout (file &optional editable rev) OK
@@ -231,6 +231,10 @@
(defalias 'vc-git-responsible-p 'vc-git-root)
+(defun vc-git-unregister (file)
+ (vc-git-command nil 0 file "rm" "-f" "--cached" "--"))
+
+
(defun vc-git-checkin (files rev comment)
(let ((coding-system-for-write git-commits-coding-system))
(vc-git-command nil 0 files "commit" "-m" comment "--only" "--")))