Merge branch 'js/git-gui-commit-gpgsign'

gitster · gitster · commit e6a51afba496 · 2016-09-15T14:11:16.000-07:00
"git commit-tree" stopped reading commit.gpgsign configuration
variable that was meant for Porcelain "git commit" in Git 2.9; we
forgot to update "git gui" to look at the configuration to match
this change.

* js/git-gui-commit-gpgsign:
  git-gui: respect commit.gpgsign again
diff --git 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
 	}

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`	`}`