summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-09-09 14:28:24 +0200
committerJunio C Hamano <gitster@pobox.com>2016-09-11 14:52:27 -0700
commit2afe6b733e002f6bf5976988646fdcd610b129dc (patch)
tree7b5947b35c19777008fa5f265175f328c44aad8f
parent4498b3a50a0e839788682f672df267cbc1ba9292 (diff)
downloadgit-2afe6b733e002f6bf5976988646fdcd610b129dc.tar.gz
git-gui: respect commit.gpgsign again
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>
-rw-r--r--lib/commit.tcl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl
index 864b687057..01d2cc280b 100644
--- 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
}