[PATCH] git-gui: respect commit.gpgsign again

[PATCH] git-gui: respect commit.gpgsign again

[Johannes Schindelin]

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>
---
Published-As: https://github.com/dscho/git/releases/tag/git-gui-gpgsign-v1
Fetch-It-Via: git fetch https://github.com/dscho/git git-gui-gpgsign-v1

 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 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
 	}
-- 
2.10.0.windows.1.10.g803177d

base-commit: 6ebdac1bab966b720d776aa43ca188fe378b1f4b

Re: [PATCH] git-gui: respect commit.gpgsign again

[Junio C Hamano]

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign`
> config setting. This broke committing in Git GUI.

Thanks.  Will shift it up to apply to my copy of git-gui project and
then pull in the result.

>  git-gui/lib/commit.tcl | 3 +++
>  1 file changed, 3 insertions(+)

Re: [PATCH] git-gui: respect commit.gpgsign again

[Johannes Schindelin]

Hi Junio,

On Fri, 9 Sep 2016, Junio C Hamano wrote:

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign`
> > config setting. This broke committing in Git GUI.
> 
> Thanks.  Will shift it up to apply to my copy of git-gui project and
> then pull in the result.

Thanks. There are a couple more git-gui patches waiting for quite a long
time. So you prefer them still as patches to git-gui.git?

Also, I just noticed poor wording. Would you mind fixing it up by

	s/committing/& with GPG signature/

?

Thanks,
Dscho

Re: [PATCH] git-gui: respect commit.gpgsign again

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Thanks. There are a couple more git-gui patches waiting for quite a long
> time. So you prefer them still as patches to git-gui.git?

I prefer not to have to worry about them myself ;-)  That means that
even if Pat steps down, the next maintainer for git-gui project
would not be me, so I wouldn't be making a unilateral decision to
re-root git-gui.git project one-level down.

> Also, I just noticed poor wording. Would you mind fixing it up by
>
> 	s/committing/& with GPG signature/

Ouch, I didn't notice.  It's not in 'next' yet, so let me see if I
can futz with the history.

Thanks.

Re: [PATCH] git-gui: respect commit.gpgsign again

[Johannes Schindelin]

Hi Junio,

On Sun, 11 Sep 2016, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Thanks. There are a couple more git-gui patches waiting for quite a long
> > time. So you prefer them still as patches to git-gui.git?
> 
> I prefer not to have to worry about them myself ;-)  That means that
> even if Pat steps down, the next maintainer for git-gui project
> would not be me, so I wouldn't be making a unilateral decision to
> re-root git-gui.git project one-level down.

Makes sense.

> > Also, I just noticed poor wording. Would you mind fixing it up by
> >
> > 	s/committing/& with GPG signature/
> 
> Ouch, I didn't notice.  It's not in 'next' yet, so let me see if I
> can futz with the history.

Thank you!
Dscho