git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Alexander Gavrilov <angavrilov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH (GIT-GUI)] git-gui: Add more integration options to citool.
Date: Fri, 26 Sep 2008 07:45:36 -0700	[thread overview]
Message-ID: <20080926144536.GA3669@spearce.org> (raw)
In-Reply-To: <200809261419.41392.angavrilov@gmail.com>

Alexander Gavrilov <angavrilov@gmail.com> wrote:
> On Wednesday 24 September 2008 20:52:01 Shawn O. Pearce wrote:
> > 
> > --8<--
> > git-gui: Hide commit related UI during citool --nocommit
> 
> I believe that the 'Sign Off' button should better be controlled by the nocommitmsg
> option; otherwise this looks good to me. But I'm not the best thinker at the
> moment (had a cold).

Since I've already pushed that patch in both git-gui.git and git.git
how is this as a followup?

--8<--
git-gui: Show/hide "Sign Off" based on nocommitmsg option

If citool --nocommit is invoked we hide the Sign Off features, as
the commit message area is not editable.  But we really want the
selection tied to the message area's editing ability.

Suggested-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 git-gui.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-gui.sh b/git-gui.sh
index 4085e8f..09ce410 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2413,7 +2413,7 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 
 	.mbar.commit add separator
 
-	if {![is_enabled nocommit]} {
+	if {![is_enabled nocommitmsg]} {
 		.mbar.commit add command -label [mc "Sign Off"] \
 			-command do_signoff \
 			-accelerator $M1T-S
@@ -2743,7 +2743,7 @@ pack .vpane.lower.commarea.buttons.incall -side top -fill x
 lappend disable_on_lock \
 	{.vpane.lower.commarea.buttons.incall conf -state}
 
-if {![is_enabled nocommit]} {
+if {![is_enabled nocommitmsg]} {
 	button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
 		-command do_signoff
 	pack .vpane.lower.commarea.buttons.signoff -side top -fill x
-- 
1.6.0.2.508.g2bf53a


-- 
Shawn.

  reply	other threads:[~2008-09-26 14:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-12 18:43 [RFC PATCH (GIT-GUI)] git-gui: Add more integration options to citool Alexander Gavrilov
2008-09-24 16:52 ` Shawn O. Pearce
2008-09-26 10:19   ` Alexander Gavrilov
2008-09-26 14:45     ` Shawn O. Pearce [this message]
2008-09-30  7:53       ` Alexander Gavrilov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080926144536.GA3669@spearce.org \
    --to=spearce@spearce.org \
    --cc=angavrilov@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).