summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-11 21:53:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-11 21:54:46 (GMT)
commitf14a310e8b665d0f1ac8cd91db3b101873a9bc5e (patch)
treef7d29cb8a3c2e2dc065d524fe45cf8567334af6b /git-gui
parent0202c411edc25940cc381bf317badcdf67670be4 (diff)
parent2afe6b733e002f6bf5976988646fdcd610b129dc (diff)
downloadgit-f14a310e8b665d0f1ac8cd91db3b101873a9bc5e.zip
git-f14a310e8b665d0f1ac8cd91db3b101873a9bc5e.tar.gz
git-f14a310e8b665d0f1ac8cd91db3b101873a9bc5e.tar.bz2
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
Diffstat (limited to 'git-gui')
-rw-r--r--git-gui/lib/commit.tcl3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 864b687..01d2cc2 100644
--- 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
}