diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:38 -0700 |
| commit | d7e74c940b9a2f9a8d1c5bfb1c7df5591afb9666 (patch) | |
| tree | e2eff22c14735e054fd20a9233c7ce442e1928a6 | |
| parent | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint (diff) | |
| parent | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign (diff) | |
| download | tgif-d7e74c940b9a2f9a8d1c5bfb1c7df5591afb9666.tar.xz | |
Merge branch 'js/git-gui-commit-gpgsign' into maint
"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
| -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 } |