# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1264368197 28800
# Node ID 1c559638a80629f077a144fb6785ade6b677b4e5
# Parent  9b98e092d459cbb3de2747a5d5272a39a7f21615
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.

diff -r 9b98e092d459 -r 1c559638a806 etc/NEWS
--- a/etc/NEWS	Sun Jan 24 13:08:53 2010 -0800
+++ b/etc/NEWS	Sun Jan 24 13:23:17 2010 -0800
@@ -322,9 +322,6 @@
 **** 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 -r 9b98e092d459 -r 1c559638a806 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 24 13:08:53 2010 -0800
+++ b/lisp/ChangeLog	Sun Jan 24 13:23:17 2010 -0800
@@ -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 -r 9b98e092d459 -r 1c559638a806 lisp/vc-git.el
--- a/lisp/vc-git.el	Sun Jan 24 13:08:53 2010 -0800
+++ b/lisp/vc-git.el	Sun Jan 24 13:23:17 2010 -0800
@@ -118,13 +118,6 @@
   :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 @@
 (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 @@
     (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 @@
 (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.