diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:16 -0700 |
| commit | e6a51afba496768fc44b15934c59344e423ff4e3 (patch) | |
| tree | 646fe0753e2c02a8ddfcbfb71a066dd2fe228eed /git-gui | |
| parent | Merge branch 'js/sequencer-wo-die' (diff) | |
| parent | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign (diff) | |
| download | tgif-e6a51afba496768fc44b15934c59344e423ff4e3.tar.xz | |
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.tcl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 864b687057..01d2cc280b 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 } |