aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-07-23 20:56:13 +0000
committerDan Nicolaescu2007-07-23 20:56:13 +0000
commitd7009f45d8f4a5bb98790664290e8ef535dd74f0 (patch)
tree5cdb7c8690799cba02a02a95f543aa8fb30992df
parentf310189cfa994132b42033dd82b81c5159a67fd5 (diff)
downloademacs-d7009f45d8f4a5bb98790664290e8ef535dd74f0.tar.gz
emacs-d7009f45d8f4a5bb98790664290e8ef535dd74f0.zip
(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 09572aa1cd5..7e3b2f3cbf3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12007-07-23 Alexandre Julliard <julliard@winehq.org> 12007-07-23 Alexandre Julliard <julliard@winehq.org>
2 2
3 * vc-git.el (vc-git-delete-file, vc-git-rename-file): New functions. 3 * vc-git.el (vc-git-delete-file, vc-git-rename-file)
4 (vc-git-unregister): New functions.
4 (vc-git-find-version): Use the result of ls-files as a parameter 5 (vc-git-find-version): Use the result of ls-files as a parameter
5 for cat-file 6 for cat-file
6 7
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index d65d8428e61..de6be9af733 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -66,7 +66,7 @@
66;; - responsible-p (file) OK 66;; - responsible-p (file) OK
67;; - could-register (file) NEEDED 67;; - could-register (file) NEEDED
68;; - receive-file (file rev) ?? 68;; - receive-file (file rev) ??
69;; - unregister (file) NEEDED 69;; - unregister (file) OK
70;; * checkin (files rev comment) OK 70;; * checkin (files rev comment) OK
71;; * find-version (file rev buffer) OK 71;; * find-version (file rev buffer) OK
72;; * checkout (file &optional editable rev) OK 72;; * checkout (file &optional editable rev) OK
@@ -231,6 +231,10 @@
231 231
232(defalias 'vc-git-responsible-p 'vc-git-root) 232(defalias 'vc-git-responsible-p 'vc-git-root)
233 233
234(defun vc-git-unregister (file)
235 (vc-git-command nil 0 file "rm" "-f" "--cached" "--"))
236
237
234(defun vc-git-checkin (files rev comment) 238(defun vc-git-checkin (files rev comment)
235 (let ((coding-system-for-write git-commits-coding-system)) 239 (let ((coding-system-for-write git-commits-coding-system))
236 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) 240 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--")))