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 864b687057c9759f2b06a9a83e3ca18c51113d92..01d2cc280ba7832840cb8ef64844daa88ebd9670 100644 (file)
--- 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
        }