]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-gui: respect commit.gpgsign again
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 9 Sep 2016 12:28:24 +0000 (14:28 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 Sep 2016 21:52:27 +0000 (14:52 -0700)
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 https://github.com/git-for-windows/git/issues/850

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
lib/commit.tcl

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