From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 11 Sep 2016 21:53:26 +0000 (-0700)
Subject: Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign
X-Git-Tag: v2.10.1~20^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f14a310e8b665d0f1ac8cd91db3b101873a9bc5e?hp=0202c411edc25940cc381bf317badcdf67670be4

Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign

* 'js/commit-gpgsign' of ../git-gui:
git-gui: respect commit.gpgsign again
---

diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 864b687057..01d2cc280b 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -369,6 +369,9 @@ A rescan will be automatically started now.
 	# -- Create the commit.
 	#
 	set cmd [list commit-tree $tree_id]
+	if {[is_config_true commit.gpgsign]} {
+		lappend cmd -S
+	}
 	foreach p [concat $PARENT $MERGE_HEAD] {
 		lappend cmd -p $p
 	}