From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 24 Sep 2008 17:04:34 GMT
Subject: Re: [GIT-GUI PATCH] call prepare-commit-msg hook
Message-ID: <20080924170434.GW3669@spearce.org>
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.