exherbo-config/autopatches/ebuild_unpack_post/dev-scm/git/28d39f71134d8cde70096e22c74405f8b2eb05d2.patch

30 lines
947 B
Diff
Raw Normal View History

From 28d39f71134d8cde70096e22c74405f8b2eb05d2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 9 Sep 2016 14:25:46 +0200
Subject: [PATCH] git-gui: respect commit.gpgsign again
As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign`
config setting. This broke committing in Git GUI.
This fixes https://github.com/git-for-windows/git/issues/850
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
git-gui/lib/commit.tcl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 60edf99..e3183a6 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -388,6 +388,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
}