threads / patch / 44047

patchgit-gui: respect commit.gpgsign again

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

## tl;dr

5 messages between Sep 9, 2016 and Sep 12, 2016. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Johannes Schindelin· Sep 9, 2016, 12:28 UTC · lore

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(+)
Show changes to git-gui/lib/commit.tcl +3 −0
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
Junio C Hamano· Sep 9, 2016, 18:29 UTC · re: Johannes Schindelin · lore

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

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(+)
Johannes Schindelin· Sep 10, 2016, 07:05 UTC · re: Junio C Hamano · lore

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

Hi Junio,
On Fri, 9 Sep 2016, Junio C Hamano wrote:
Show 7 quoted lines
> 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

Junio C Hamano· Sep 11, 2016, 21:52 UTC · re: Johannes Schindelin · lore

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

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.
Johannes Schindelin· Sep 12, 2016, 08:14 UTC · re: Junio C Hamano · lore

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

Hi Junio,
On Sun, 11 Sep 2016, Junio C Hamano wrote:
Show 9 quoted lines
> 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.
Show 6 quoted lines
> > 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

← back to recent threads