From: "Shawn O. Pearce" <spearce@spearce.org>
To: Joshua Williams <joshua.williams@qlogic.com>
Cc: git@vger.kernel.org,
Jay Blakeborough <jay.blakeborough@qlogic.com>,
Bill Lohse <bill.lohse@qlogic.com>
Subject: Re: [GIT-GUI PATCH] call prepare-commit-msg hook
Date: Wed, 24 Sep 2008 10:04:34 -0700 [thread overview]
Message-ID: <20080924170434.GW3669@spearce.org> (raw)
In-Reply-To: <48D02D99.9090102@qlogic.com>
Joshua Williams <joshua.williams@qlogic.com> wrote:
> Small change. Still need to load MERGE_MSG and SQUASH_MSG
> if there's no prepare-commit-msg hook. We now process the hook
> first and if it's not there, load MERGE_MSG or SQUASH_MSG.
>
> Signed-off-by: Joshua Williams <joshua.williams@qlogic.com>
This patch looks reasonable. My only comment is maybe we want
to delete PREPARE_COMMIT_MSG file when we "exit 1" when the hook
has declined.
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index 10d8a44..8d06cd1 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
Can you please try to put this onto my current git-gui tree?
I don't have the base 10d8a44 object so I can't 3-way merge
this in, and the patch doesn't apply cleanly anymore.
--
Shawn.
next prev parent reply other threads:[~2008-09-24 17:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-16 21:12 [GIT-GUI PATCH] call prepare-commit-msg hook Joshua Williams
2008-09-16 22:05 ` Joshua Williams
2008-09-24 17:04 ` Shawn O. Pearce [this message]
2008-09-24 19:11 ` Joshua Williams
2008-09-24 19:46 ` Shawn O. Pearce
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=20080924170434.GW3669@spearce.org \
--to=spearce@spearce.org \
--cc=bill.lohse@qlogic.com \
--cc=git@vger.kernel.org \
--cc=jay.blakeborough@qlogic.com \
--cc=joshua.williams@qlogic.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.