git-gui: respect commit.gpgsign again

dscho · gitster · commit 2afe6b733e00 · 2016-09-11T14:52:27.000-07:00
As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign` config setting. This broke committing with GPG signature in Git GUI. This fixes #850 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/lib/commit.tcl b/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
 	}

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,9 @@ A rescan will be automatically started now.`
`369`	`369`	`# -- Create the commit.`
`370`	`370`	`#`
`371`	`371`	`set cmd [list commit-tree $tree_id]`
	`372`	`+ if {[is_config_true commit.gpgsign]} {`
	`373`	`+ lappend cmd -S`
	`374`	`+ }`
`372`	`375`	`foreach p [concat $PARENT $MERGE_HEAD] {`
`373`	`376`	`lappend cmd -p $p`
`374`	`377`	`}`