summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 23:23:05 +0100
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 23:23:05 +0100
commit34fe0a7041399811df33e9e64d51707b5fa9579b (patch)
tree388e6a9fcddb501004c923d116d1259c6ddae032
parentMerge branch 'sy/i18n' into pu (diff)
parentgit-gui: respect commit.gpgsign again (diff)
downloadtgif-34fe0a7041399811df33e9e64d51707b5fa9579b.tar.xz
Merge branch 'js/commit-gpgsign' into pu
-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
}