summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-15 21:11:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-15 21:11:16 (GMT)
commite6a51afba496768fc44b15934c59344e423ff4e3 (patch)
tree646fe0753e2c02a8ddfcbfb71a066dd2fe228eed /git-gui
parent2a4062a4a866e31f449ae2578f8c30286c671fbb (diff)
parentf14a310e8b665d0f1ac8cd91db3b101873a9bc5e (diff)
downloadgit-e6a51afba496768fc44b15934c59344e423ff4e3.zip
git-e6a51afba496768fc44b15934c59344e423ff4e3.tar.gz
git-e6a51afba496768fc44b15934c59344e423ff4e3.tar.bz2
Merge branch 'js/git-gui-commit-gpgsign'
"git commit-tree" stopped reading commit.gpgsign configuration variable that was meant for Porcelain "git commit" in Git 2.9; we forgot to update "git gui" to look at the configuration to match this change. * js/git-gui-commit-gpgsign: 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
}