git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Levedahl <mlevedahl@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, jsixt@viscovery.net, spearce@spearce.org,
	Mark Levedahl <mlevedahl@gmail.com>
Subject: [PATCH 2/2 v2] git-gui - provide commit base to the hooks/pre-commit script
Date: Mon,  7 Jun 2010 22:56:03 -0400	[thread overview]
Message-ID: <1275965763-18940-2-git-send-email-mlevedahl@gmail.com> (raw)
In-Reply-To: <1275965763-18940-1-git-send-email-mlevedahl@gmail.com>

If hooks/pre-commit acts based upon the changes to be checked in
rather than just the resulting content, the script needs to know which
commit to use. For a normal commit, this is HEAD, but when amending this
is HEAD~1. So, this modifies commit.tcl to pass $1 as HEAD|HEAD~1 depending
upon the commit type. Existing scripts are unaffected as they did not
expect any argument so will silently ignore this extra bit of info.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 git-gui/lib/commit.tcl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 7f459cd..a62edc9 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -225,7 +225,13 @@ A good commit message has the following format:
 
 	# -- Run the pre-commit hook.
 	#
-	set fd_ph [githook_read pre-commit]
+	if {[string compare $commit_type "normal"] == 0} {
+		set against "HEAD"
+	} else {
+		set against "HEAD~1"
+	}
+
+	set fd_ph [githook_read pre-commit $against]
 	if {$fd_ph eq {}} {
 		commit_commitmsg $curHEAD $msg_p
 		return
-- 
1.7.1.269.g9fb6

  reply	other threads:[~2010-06-08  2:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-08  2:56 [PATCH 1/2 v2] commit.c - provide base commit to the hooks/pre-commit script Mark Levedahl
2010-06-08  2:56 ` Mark Levedahl [this message]
2010-06-19  2:59   ` [PATCH 2/2 v2] git-gui - provide commit base " Mark Levedahl
2010-06-21  4:54     ` Junio C Hamano
2010-06-21  5:00       ` Jeff King
2010-06-22  1:07         ` Mark Levedahl

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=1275965763-18940-2-git-send-email-mlevedahl@gmail.com \
    --to=mlevedahl@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jsixt@viscovery.net \
    --cc=peff@peff.net \
    --cc=spearce@spearce.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).