3 files changed, 7 insertions, 19 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 5d1ffac8904..5eb39faf6ba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -322,9 +322,6 @@ backends do not support this.
 **** The short log format for git makes use of the graph display, so
 it's not supported on git versions earlier than 1.5.
 
-**** The new variable vc-git-add-signoff can be used to add a
-Signed-off-by line when committing.
-
 **** Support for operating with stashes has been added to vc-dir: the stash list is
 displayed in the *vc-dir* header, stashes can be created, removed, applied and
 their content displayed.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb7f2b41d11..fa3761738bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Remove support for adding --signoff on commit.
+        Future support will use an incompatible generic mechanism.
+        * vc-git.el (vc-git-add-signoff): Remove variable.
+        (vc-git-toggle-signoff): Remove function.
+        (vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
+
         * term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
         from xterm-set-background-mode.  Return t if the background mode
         was set.
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 52482d9ff4b..4896f79a395 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -118,13 +118,6 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "23.1"
   :group 'vc)
 
-(defcustom vc-git-add-signoff nil
-  "Add a Signed-off-by line when committing."
-  :type 'boolean
-  :version "23.2"
-  :group 'vc)
-
-
 (defvar git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
 
@@ -515,7 +508,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (defun vc-git-checkin (files rev comment)
   (let ((coding-system-for-write git-commits-coding-system))
     (vc-git-command nil 0 files "commit"
-                    (if vc-git-add-signoff "-s") "-m" comment "--only" "--")))
+                    "-m" comment "--only" "--")))
 
 (defun vc-git-find-revision (file rev buffer)
   (let* (process-file-side-effects
@@ -766,10 +759,6 @@ or BRANCH^ (where \"^\" can be repeated)."
     (define-key map [git-ss]
       '(menu-item "Show Stash..." vc-git-stash-show
                   :help "Show stash contents"))
-    (define-key map [git-sig]
-      '(menu-item "Add Signed-off-by on commit" vc-git-toggle-signoff
-              :help "Add Add Signed-off-by when commiting (i.e. add the -s flag)"
-              :button (:toggle . vc-git-add-signoff)))
     map))
 
 (defun vc-git-extra-menu () vc-git-extra-menu-map)
@@ -779,10 +768,6 @@ or BRANCH^ (where \"^\" can be repeated)."
 (defun vc-git-root (file)
   (vc-find-root file ".git"))
 
-(defun vc-git-toggle-signoff ()
-  (interactive)
-  (setq vc-git-add-signoff (not vc-git-add-signoff)))
-
 ;; Derived from `lgrep'.
 (defun vc-git-grep (regexp &optional files dir)
   "Run git grep, searching for REGEXP in FILES in directory DIR.